延期 取项目的主管单位和区域

pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java

@@ -274,7 +274,7 @@ public class ProjectFileManage {
         // 把条件值给放入工作流
         defaultDeclaredProjectManage.buildCondition(params, project);
         // 获取发起单位、发起单位主管单位、发起单位上级条线主管单位信息
-        Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMapUserOrgCode(employeeCode, project);
+        Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMapUserOrgCode(project);
         String instanceId =
             processInstanceService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap);
         log.info("申请借阅申报成功 【{}】", instanceId);

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -219,18 +219,12 @@ public class DefaultDeclaredProjectManage {
         return orgMap;
     }
 
-    public Map<String, OrgInfoDTO> buildOrgModelMapUserOrgCode(String employeeCode,Project project) {
+    public Map<String, OrgInfoDTO> buildOrgModelMapUserOrgCode(Project project) {
         Map<String, OrgInfoDTO> orgMap = new HashMap<>();
 
         // 查出所有的单位流程配置
         List<WflowOrgModels> orgModelsList = orgProcdefService.list();
 
-        UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfoByEmployeeCode(employeeCode);
-        if(Objects.isNull(userFullInfo)){
-            log.warn("取不到员工 返回空map");
-            return Collections.emptyMap();
-        }
-
         String startOrgCode = project.getBuildOrgCode();
         String startOrgName = project.getBuildOrgName();
         String startOrgParentCode;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java

@@ -264,7 +264,7 @@ public class DelayedApplyManage {
                         || project.getPlanAcceptanceTime().compareTo(LocalDateTime.now()) > 0)
                 .throwMessage("当前项目还未过期验收");
 
-        String regionCode = user.getRegionCode();
+        String regionCode = project.getAreaCode();
 
         WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class)
                 .eq(WflowModels::getRegionCode, regionCode)
@@ -283,7 +283,7 @@ public class DelayedApplyManage {
         //把条件值给放入工作流
         defaultDeclaredProjectManage.buildCondition(params, project);
         // 获取发起单位、发起单位主管单位、发起单位上级条线主管单位信息
-        Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(employeeCode, project);
+        Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMapUserOrgCode(project);
         String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap);
         log.info("延期申请申报成功 【{}】", instanceId);