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 ecbd0b8a6..b16552d00 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 @@ -623,6 +623,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + // 吹哨 + Result result = adminFeignClient.getCompleteDept(entity.getGridId()); + String streetId = ""; + if( result.getCode() == 0){ + CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); + streetId = completeDeptDTO.getStreetId() == null ? "" : completeDeptDTO.getStreetId().toString(); + }else{ + throw new RenException(result.getMsg()); + } + if (!dto.getHandlerDeptId().equals(entity.getGridId()) || !dto.getHandlerDeptId().equals(streetId)) { + return new Result().error("请选择正确的处理部门"); + } + // 项目流转校验 Result checkResult = this.checkItemCirculation(dto); if (!checkResult.success()) { @@ -674,8 +687,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 - if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || - ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + if (!dto.getHandlerDeptId().equals(entity.getGridId())) { + return new Result().error("请选择正确的处理部门"); + } + informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_CLOSED); ItemEntity itemEntity = new ItemEntity();