From addff6542fc35400137b58ba9bf7d76a6ef8a392 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 15 May 2020 17:24:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=95=B4=E6=B4=81=E3=80=91-=E7=8E=8B=E5=85=AC?= =?UTF-8?q?=E5=B3=B0-2020-05-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/service/impl/IssueServiceImpl.java | 5 ----- .../item/service/impl/ItemServiceImpl.java | 18 ------------------ 2 files changed, 23 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 363c0d85f..ab1e37300 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -187,9 +187,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp handleEntity.setAdvice(dto.getAdvice()); handleEntity.setState(dto.getState()); handleEntity.setIssueId(dto.getId()); - UserDetail user = SecurityUser.getUser(); - /*handleEntity.setHandlerDeptId(user.getDeptId()); - handleEntity.setHandlerDept(user.getDeptName());*/ handleEntity.setHandlerDeptId(dto.getHandlerDeptId()); handleEntity.setHandlerDept(dto.getHandlerDept()); @@ -237,8 +234,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); itemHandleProcessEntity.setHandleAdvice(dto.getAdvice()); itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice()); - /*itemHandleProcessEntity.setHandlerDeptId(user.getDeptId()); - itemHandleProcessEntity.setHandlerDept(user.getDeptName());*/ itemHandleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId()); itemHandleProcessEntity.setHandlerDept(dto.getHandlerDept()); itemHandleProcessService.insert(itemHandleProcessEntity); 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 63b9049f4..63668b30e 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 @@ -322,22 +322,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemDetailForPCEndResultDTO getItemDetailById(String id) { // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); - /*UserDetail user = SecurityUser.getUser(); - // 获取已流转部门 - List itemDeptDTOS = itemDeptService.listOfItemDept(id, user.getDeptId()); - // 获取可操作处理和可流转部门 - switch (user.getTypeKey()) { - case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: - resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); - break; - case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY: - case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT: - case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT: - resultDTO = this.getHandleCategory(resultDTO); - break; - case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: - resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); - }*/ //获取项目基本信息 ItemEntity entity = this.selectById(id); // 获取项目处理进度 @@ -632,8 +616,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem informationFormDTO.setRelBusinessContent("项目：" + entity.getItemContent()); ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); - /*handleProcessEntity.setHandlerDeptId(user.getDeptId()); - handleProcessEntity.setHandlerDept(user.getDeptName());*/ handleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId()); handleProcessEntity.setHandlerDept(dto.getHandlerDept()); handleProcessEntity.setItemId(dto.getId());