From 7f8f000fa3abb228917f57891713aaae51aba3ae Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 10 Jul 2023 16:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=20=E5=8F=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E4=B8=BB=E7=AE=A1=E5=8D=95=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java | 2 +- .../projectdeclared/manage/DefaultDeclaredProjectManage.java | 8 +------- .../pmapi/projectdeclared/manage/DelayedApplyManage.java | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java index 7f5f74a..61f641b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java @@ -274,7 +274,7 @@ public class ProjectFileManage { // 把条件值给放入工作流 defaultDeclaredProjectManage.buildCondition(params, project); // 获取发起单位、发起单位主管单位、发起单位上级条线主管单位信息 - Map orgModelMap = defaultDeclaredProjectManage.buildOrgModelMapUserOrgCode(employeeCode, project); + Map orgModelMap = defaultDeclaredProjectManage.buildOrgModelMapUserOrgCode(project); String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap); log.info("申请借阅申报成功 【{}】", instanceId); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java index f0a83c9..f7471dc 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java @@ -219,18 +219,12 @@ public class DefaultDeclaredProjectManage { return orgMap; } - public Map buildOrgModelMapUserOrgCode(String employeeCode,Project project) { + public Map buildOrgModelMapUserOrgCode(Project project) { Map orgMap = new HashMap<>(); // 查出所有的单位流程配置 List 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; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java index c3aef15..d726b54 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java +++ b/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 orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(employeeCode, project); + Map orgModelMap = defaultDeclaredProjectManage.buildOrgModelMapUserOrgCode(project); String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap); log.info("延期申请申报成功 【{}】", instanceId);