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 a580d9381e..59ee2c4bfe 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,10 +243,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId()); + deleteGridFormDTO.setUserId(tokenDto.getUserId()); if (userIdDTOS.size()==0){ baseDao.deleteGrid(deleteGridFormDTO); }else { - deleteGridFormDTO.setUserId(tokenDto.getUserId()); Result gridStaffCountDTOResult = epmetUserFeignClient.selectGridStaffCountByUserId(userIdDTOS); if (gridStaffCountDTOResult.getData().getEnableCount() == 0) { baseDao.deleteGrid(deleteGridFormDTO);