diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index 4bf3fdf199..f7cf1ca99b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -664,6 +664,12 @@ public class BuildingServiceImpl implements BuildingService {
     public Boolean changeBuilding(Map<String, Object> params) {
 
 
+        IcNeighborHoodEntity neighborHood = neighborHoodService.selectById(params.get("neighborhoodId").toString());
+        if (neighborHood == null){
+            return true;
+        }
+        params.put("gridId",neighborHood.getGridId());
+
         // 找到本身的building 先改掉小区id
         IcBuildingEntity building = icBuildingDao.selectById(params.get("buildingId").toString());
         if (building == null){
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 d6995b7b71..c5facbb3e7 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
@@ -4402,6 +4402,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         List<IcResiUserEntity> resiUserEntities = icResiUserDao.selectList(queryWrapper);
         resiUserEntities.forEach(user->{
             user.setVillageId(params.get("neighborhoodId").toString());
+            user.setGridId(params.get("gridId").toString());
             icResiUserDao.updateById(user);
         });