From 5a1191aecfdfe907753335d9d6243d0edc045a87 Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Tue, 28 Apr 2020 14:31:05 +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

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<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);