From a21c3790c7278974c306ed2aa7c41603a869516d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 15 Mar 2022 14:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E9=87=8D=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java      | 2 +-
 .../com/epmet/service/impl/NeighborHoodServiceImpl.java     | 6 +++---
 .../src/main/resources/mapper/IcNeighborHoodDao.xml         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index 3203e96854..43b6aedaf5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -48,7 +48,7 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
                                                 @Param("agencyNameList") List<String> agencyNameList,
                                                 @Param("gridNameList") List<String> gridNameList);
 
-    Integer checkNameUq(@Param("customerId") String customerId,
+    Integer checkNameUq(@Param("gridId") String gridId,
                         @Param("neighborHoodName")String neighborHoodName,
                         @Param("neighborId")String neighborId);
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
index 5c68f83dba..0aeca0d13b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
@@ -73,8 +73,8 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void AddNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO) {
-        //同一客户下，小区名称唯一
-        Integer count = icNeighborHoodDao.checkNameUq(customerId,formDTO.getNeighborHoodName(),null);
+        //同一网格下，小区名称唯一
+        Integer count = icNeighborHoodDao.checkNameUq(formDTO.getGridId(),formDTO.getNeighborHoodName(),null);
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
         }
@@ -155,7 +155,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
     @Transactional(rollbackFor = Exception.class)
     public void UpdateNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO) {
         //同一客户下，小区名称唯一
-        Integer count = icNeighborHoodDao.checkNameUq(customerId,formDTO.getNeighborHoodName(),formDTO.getNeighborHoodId());
+        Integer count = icNeighborHoodDao.checkNameUq(formDTO.getGridId(),formDTO.getNeighborHoodName(),formDTO.getNeighborHoodId());
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
         }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 36daaf0d27..4b4576bb6b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -208,7 +208,7 @@
                count(*)
         from ic_neighbor_hood a
         where a.del_flag='0'
-        and a.customer_id=#{customerId}
+        and a.grid_id=#{customerId}
         and a.NEIGHBOR_HOOD_NAME=#{neighborHoodName}
         <if test=" null != neighborId and neighborId.trim() != ''">
             and a.id !=#{neighborId}