【项目管理】【处理部门校验】-王公峰-2020-05-18

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -229,7 +229,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_EVENT);
         informationFormDTO.setBusinessId(eventsEntity.getId());
 
-        if (!dto.getHandlerDeptId().equals(entity.getGridId())) {
+        if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) {
             return new Result().error("请选择正确的处理部门");
         }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -204,7 +204,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         informationFormDTO.setBusinessId(entity.getId());
         informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent());
 
-        if (!dto.getHandlerDeptId().equals(entity.getGridId())) {
+        if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) {
             return new Result().error("请选择正确的处理部门");
         }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -625,14 +625,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
                 // 吹哨
                 Result result = adminFeignClient.getCompleteDept(entity.getGridId());
-                String streetId = "";
+                Long streetId = 0L;
                 if( result.getCode() == 0){
                     CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData();
-                    streetId = completeDeptDTO.getStreetId() == null ? "" : completeDeptDTO.getStreetId().toString();
+                    streetId = completeDeptDTO.getStreetId();
                 }else{
                     throw new RenException(result.getMsg());
                 }
-                if (!dto.getHandlerDeptId().equals(entity.getGridId()) || !dto.getHandlerDeptId().equals(streetId)) {
+                if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() || dto.getHandlerDeptId().longValue() != streetId.longValue()) {
                     return new Result().error("请选择正确的处理部门");
                 }
 
@@ -688,7 +688,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 handleProcessEntity.setState(dto.getHandleCategory());
                 // 更新项目状态
                 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
-                    if (!dto.getHandlerDeptId().equals(entity.getGridId())) {
+                    if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) {
                         return new Result().error("请选择正确的处理部门");
                     }