diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 2c6090dc9e..a580d9381e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -243,12 +243,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId()); - deleteGridFormDTO.setUserId(tokenDto.getUserId()); - Result gridStaffCountDTOResult = epmetUserFeignClient.selectGridStaffCountByUserId(userIdDTOS); - if (gridStaffCountDTOResult.getData().getEnableCount()==0){ + if (userIdDTOS.size()==0){ baseDao.deleteGrid(deleteGridFormDTO); }else { - return new Result().error(EpmetErrorCode.NOT_DEL_GRID.getCode()); + deleteGridFormDTO.setUserId(tokenDto.getUserId()); + Result gridStaffCountDTOResult = epmetUserFeignClient.selectGridStaffCountByUserId(userIdDTOS); + if (gridStaffCountDTOResult.getData().getEnableCount() == 0) { + baseDao.deleteGrid(deleteGridFormDTO); + } else { + return new Result().error(EpmetErrorCode.NOT_DEL_GRID.getCode()); + } } return new Result(); }