From 4c91dd51aa8b64c98dcdc7bd5a683db105ab9bec Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Tue, 28 Apr 2020 14:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/CustomerGridServiceImpl.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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<CustomerGridDao, Cu
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
         List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
-        deleteGridFormDTO.setUserId(tokenDto.getUserId());
-        Result<GridStaffCountDTO> 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<GridStaffCountDTO> 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();
     }