From cf1bf5c220b2de4082014ff43ee3180292d8cf91 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 15 May 2020 17:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=84=8F=E8=A7=81=E8=81=94=E5=8A=A8=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 ca85bd302..6f81306eb 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 @@ -355,11 +355,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemDetailForPCEndResultDTO getHandleResultDTOS(HandleResultDTOSFormDTO dto) { // 详情 ItemDetailForPCEndResultDTO resultDTO = new ItemDetailForPCEndResultDTO(); - UserDetail user = SecurityUser.getUser(); // 获取已流转部门 List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId()); + Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); + } // 获取可操作处理和可流转部门 - switch (user.getTypeKey()) { + switch (typeKey) { case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); break;