From e57546d4e60875cb0e10a82f399fdf7fc3d77f58 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 11:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=20=2011=EF=BC=9A19=20=E5=90=B9=E5=93=A8---?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=89=8B=E5=8A=A8=E6=8B=BC=E6=8E=A5=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index b85c03e06..3bccbf77b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -910,6 +910,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("请选择正确的处理部门"); } + // 根据操作人部门，获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); + SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + sendTypeKey = sysDeptDTO.getTypeKey(); + // 手动拼接流转协助部门 + ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); + itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); + itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName()); + itemCirculationDeptResultDTO.setSelected(false); + itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey()); + List deptList = new ArrayList(); + deptList.add(itemCirculationDeptResultDTO); + dto.setDeptResultDTOS(deptList); + // 项目流转校验 Result checkResult = this.checkItemCirculation(dto); if (!checkResult.success()) { @@ -926,20 +940,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 新增流转协助部门 itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); - // 根据操作人部门，获取上一级部门ID - Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); - SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); - sendTypeKey = sysDeptDTO.getTypeKey(); - // 手动拼接流转协助部门 - ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); - itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); - itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName()); - itemCirculationDeptResultDTO.setSelected(false); - itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey()); - List deptList = new ArrayList(); - deptList.add(itemCirculationDeptResultDTO); - dto.setDeptResultDTOS(deptList); - List newDeptIds = new ArrayList<>(); newDeptIds.add(sysDeptDTO.getPid());