From 845a89b45fa9b1653219500728be3b9a7fcf99f9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 16 Jul 2022 16:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E5=8C=BA=E6=97=B6?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E9=87=8C=E7=9A=84=E5=B1=85=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/NeighborHoodServiceImpl.java | 1 +
 .../com/epmet/dto/form/IcUserBelongToChangedFormDTO.java     | 5 +++++
 .../src/main/java/com/epmet/dao/IcResiUserDao.java           | 4 +++-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java   | 5 +++--
 .../src/main/resources/mapper/IcResiUserDao.xml              | 3 ++-
 5 files changed, 14 insertions(+), 4 deletions(-)

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 65eb7c90e2..0f5079181b 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
@@ -207,6 +207,7 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
         //如果更新了网格 则需要更新网格下的居民所属关系
         if (!icNeighborHoodEntity.getGridId().equals(icNeighborHoodDTO.getGridId())){
             IcUserBelongToChangedFormDTO userForm = new IcUserBelongToChangedFormDTO();
+            userForm.setNeighborhoodId(icNeighborHoodEntity.getId());
             userForm.setSourceGridId(icNeighborHoodEntity.getGridId());
             userForm.setTargetGridId(icNeighborHoodDTO.getGridId());
             Result<Boolean> updateResult = epmetUserOpenFeignClient.changeIcResiUserBelongTo(userForm);
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java
index da773e7266..102bbd9c9b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java
@@ -19,6 +19,11 @@ public class IcUserBelongToChangedFormDTO implements Serializable {
 	 * 客户Id
 	 */
 	private String customerId;
+
+	/**
+	 * 小区ID
+	 */
+	private String neighborhoodId;
 	/**
 	 * 原网格Id
 	 */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 73e5247785..4dcf2a8537 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -322,9 +322,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      *
      * @param customerId
      * @param gridId
+     * @param neighborhoodId
      * @return
      */
-    List<String> listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId);
+    List<String> listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId, @Param("neighborhoodId") String neighborhoodId);
 
     List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId") String customerId);
 
@@ -412,6 +413,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * 通过社区ID获取所属人员
+     *
      * @param communityId
      * @return
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 7a28f47eaf..e0ec1d8c02 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2215,7 +2215,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<String> changeIcResiUserBelongTo(TokenDto tokenDto, IcUserBelongToChangedFormDTO formDTO) {
-
+        List<String> resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId(), formDTO.getNeighborhoodId());
         if (StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getSourceGridId())
                 ||StringUtils.isBlank(formDTO.getTargetGridId())){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
@@ -2224,7 +2224,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         entity.setGridId(formDTO.getTargetGridId());
         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcResiUserEntity::getGridId,formDTO.getSourceGridId())
-        .eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId());
+                .eq(IcResiUserEntity::getVillageId,formDTO.getNeighborhoodId())
+                .eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId());
         baseDao.update(entity,wrapper);
         //不调用原来的更新居民了  太慢
         /*List<String> resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId());
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 54d77d9ad5..ab53f052c8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1038,8 +1038,9 @@
         SELECT ID from ic_resi_user
         WHERE
            GRID_ID = #{gridId}
-           AND DEL_FLAG = '0'
            AND CUSTOMER_ID = #{customerId}
+           and VILLAGE_ID = #{neighborhoodId}
+           AND DEL_FLAG = '0'
     </select>
 
     <select id="getAllUserIds"  parameterType="map" resultType="java.lang.String">