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());