From 7600c3b4d6dd66653fa8dab58122e2d9390042f0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 18 May 2020 17:48:10 +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=A4=84=E7=90=86=E9=83=A8=E9=97=A8=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../events/service/impl/EpdcEventsServiceImpl.java | 2 +- .../epdc/modules/issue/service/impl/IssueServiceImpl.java | 2 +- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 0684051c3..9d858b3ba 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/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 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("请选择正确的处理部门"); } 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 b16552d00..865b9b4d6 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 @@ -625,14 +625,14 @@ public class ItemServiceImpl extends BaseServiceImpl 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 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("请选择正确的处理部门"); }