Merge remote-tracking branch 'origin/dev_govgrid' into dev

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<CustomerGridDao, Cu
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
         List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
+        deleteGridFormDTO.setUserId(tokenDto.getUserId());
         if (userIdDTOS.size()==0){
             baseDao.deleteGrid(deleteGridFormDTO);
         }else {
-            deleteGridFormDTO.setUserId(tokenDto.getUserId());
             Result<GridStaffCountDTO> gridStaffCountDTOResult = epmetUserFeignClient.selectGridStaffCountByUserId(userIdDTOS);
             if (gridStaffCountDTOResult.getData().getEnableCount() == 0) {
                 baseDao.deleteGrid(deleteGridFormDTO);