更新小区时需要更新对应的小区里的居民

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

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
 	 */

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
      */

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

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">