From 59ca5cc03fd0d56fe8ff914867a6395334d87ab6 Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Mon, 27 Apr 2020 14:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/CustomerGridDao.java        | 2 +-
 .../com/epmet/service/impl/CustomerGridServiceImpl.java     | 6 +++---
 .../src/main/resources/mapper/CustomerGridDao.xml           | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 37e60a010a..7e4219012e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -123,7 +123,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @param gridName
      * @return
      */
-    String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid);
+    String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid,@Param("gridId")String gridId);
 
     /**
      * 编辑网格信息
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 b5a83ee724..cb544cba9f 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
@@ -202,7 +202,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<AddGridResultDTO> addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) {
-        String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId());
+        String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null);
         if (checkGridName!=null){
             return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
         }
@@ -217,7 +217,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setPid(addGridFormDTO.getAgencyId());
         customerGridEntity.setPids(baseDao.selectPidsByPid(addGridFormDTO.getAgencyId()));
         baseDao.insert(customerGridEntity);
-        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId());
+        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null);
         AddGridResultDTO addGridResultDTO = new AddGridResultDTO();
         addGridResultDTO.setGridId(gridId);
         return new Result<AddGridResultDTO>().ok(addGridResultDTO);
@@ -231,7 +231,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result editGrid(TokenDto tokenDto, EditGridFormDTO editGridFormDTO) {
-        String checkGridName = baseDao.selectGridIdByGridName(editGridFormDTO.getGridName(),editGridFormDTO.getAgencyId());
+        String checkGridName = baseDao.selectGridIdByGridName(editGridFormDTO.getGridName(),editGridFormDTO.getAgencyId(),editGridFormDTO.getGridId());
         if (checkGridName!=null){
             return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
         }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index e5873c263f..be9b2e0784 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -181,6 +181,9 @@
         WHERE
             grid_name = #{gridName}
             AND pid = #{agencyId}
+            <if test="gridId != null and gridId != '' ">
+                AND id != #{gridId}
+            </if>
             AND del_flag = 0
     </select>