diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
index a3116f7c96..4c0cc40b42 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
@@ -33,5 +33,10 @@ public class AdvancedBranchRankFormDTO implements Serializable {
      */
     private String areaCode;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
     public interface AddUserInternalGroup {}
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
index a47f3e2cb1..fbca1af11d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
@@ -36,5 +36,10 @@ public class PartyPointRankFormDTO implements Serializable {
      * */
     private String monthId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
index 397f50aa7d..8ab170d826 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
@@ -36,5 +36,9 @@ public class UserPointRankFormDTO implements Serializable {
      * */
     private String monthId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index 31fed42445..dcf083d507 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -1,6 +1,8 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
@@ -146,8 +148,9 @@ public class IndexController {
      * @author sun
      */
     @PostMapping("advancedbranchrank")
-    Result<List<IndexAdvanceBranchRankResultDTO>> advancedBranchRank(@RequestBody AdvancedBranchRankFormDTO formDTO){
+    Result<List<IndexAdvanceBranchRankResultDTO>> advancedBranchRank(@RequestBody AdvancedBranchRankFormDTO formDTO, @LoginUser TokenDto loginUser){
         ValidatorUtils.validateEntity(formDTO, AdvancedBranchRankFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(loginUser.getCustomerId());
         return new Result<List<IndexAdvanceBranchRankResultDTO>>().ok(indexService.advancedBranchRank(formDTO));
     }
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java
index 9add2dd4d1..ff673cf1b0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java
@@ -1,5 +1,7 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenUserService;
@@ -47,8 +49,10 @@ public class ScreenUserController {
      * @author wxz
      */
     @PostMapping("userpointrank/withoutpartymember")
-    public Result<List<UserPointRankListResultDTO>> userPointRankWithoutPartyMem(@RequestBody UserPointRankFormDTO formDTO) {
+    public Result<List<UserPointRankListResultDTO>> userPointRankWithoutPartyMem(@RequestBody UserPointRankFormDTO formDTO, @LoginUser TokenDto loginUser) {
         ValidatorUtils.validateEntity(formDTO, UserPointRankFormDTO.AddUserInternalGroup.class);
+
+        formDTO.setCustomerId(loginUser.getCustomerId());
         return new Result<List<UserPointRankListResultDTO>>().ok(screenUserService.userPointRankWithoutPartyMem(formDTO));
     }
 
@@ -70,8 +74,9 @@ public class ScreenUserController {
      * @author wxz
      */
     @PostMapping("partypointrank")
-    public Result<List<PartyPointRankResultDTO>> partyPointRank(@RequestBody PartyPointRankFormDTO formDTO) {
+    public Result<List<PartyPointRankResultDTO>> partyPointRank(@RequestBody PartyPointRankFormDTO formDTO, @LoginUser TokenDto loginUser) {
         ValidatorUtils.validateEntity(formDTO, PartIndexScroeRankFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(loginUser.getCustomerId());
         return new Result<List<PartyPointRankResultDTO>>().ok(screenUserService.partyPointRank(formDTO));
     }
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 9da7db0673..c04e3d18e6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -240,7 +240,7 @@
     <select id="selectRankList" resultType="com.epmet.evaluationindex.screen.dto.result.IndexAdvanceBranchRankResultDTO">
         SELECT
             CONCAT(
-                (select agency_name from screen_customer_agency where agency_id = rd.parent_id),
+                (select agency_name from screen_customer_agency where agency_id = rd.parent_id <if test="customerId != null and customerId != ''">AND org.CUSTOMER_ID = #{customerId}</if>),
                 '-',
                 dm.org_name
             )AS "name",
@@ -252,7 +252,7 @@
             rd.satisfaction_ratio AS "satisfactionRatio"
         FROM
             screen_index_data_monthly dm
-        INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
+        INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id AND dm.CUSTOMER_ID = rd.CUSTOMER_ID
         <!--查询的是网格的排行 下面条件是orgType = grid-->
         INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
 
@@ -261,6 +261,9 @@
             dm.del_flag = '0'
         AND rd.del_flag = '0'
         <choose>
+            <when test="customerId != null and customerId != ''">
+                AND org.CUSTOMER_ID = #{customerId}
+            </when>
             <when test="areaCode != null and areaCode != ''">
                 AND org.AREA_CODE LIKE concat(#{areaCode}, '%')
             </when>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 4e84fe035c..2851c5a835 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -171,6 +171,9 @@
                 AND u.grid_id = #{orgId}
             </if>
         </if>
+        <if test="customerId != null and customerId != ''">
+            AND u.CUSTOMER_ID = #{customerId}
+        </if>
         ORDER BY
         u.point_total DESC,convert(u.user_name using gbk) ASC
         LIMIT #{topNum}
@@ -212,6 +215,9 @@
                     AND u.grid_id = #{orgId}
                 </if>
             </if>
+            <if test="customerId != null and customerId != ''">
+                    AND u.CUSTOMER_ID = #{customerId}
+            </if>
             ORDER BY
             u.point_total DESC
             LIMIT #{topNum}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
index 68dedbd4a0..3f9aa180a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
@@ -1,18 +1,26 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.AgencySubDeptTreeDto;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
 import com.epmet.service.StatsDimService;
 import com.epmet.service.stats.*;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("dim")
 public class DimController {
@@ -272,4 +280,53 @@ public class DimController {
         return new Result().ok(partyMemberService.statsPartyMember(customerIdAndDateIdFormDTO));
     }
 
+    /**
+     * 同步客户相关的维度：agency,department,grid
+     * 用来补充其他系统传递过来的，旧有的数据
+     * @param customerId
+     * @return
+     */
+    @PostMapping("/customer-related-dims/sync")
+    public Result syncCustomerRelatedDims(@RequestParam("customer-id") String customerId) {
+        if (StringUtils.isBlank(customerId)) {
+            String errorMsg = "【同步客户相关的维度】请传递客户ID";
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg);
+        }
+
+        boolean syncAgencySuccess = true;
+        boolean syncGridSuccess = true;
+        boolean syncDepartmentSuccess = true;
+        
+        // 一.同步agency
+        try {
+            statsDimService.syncCustomerAgencyDims(customerId);
+        } catch (Exception e) {
+            syncAgencySuccess = false;
+            log.error("【同步客户相关维度】同步agency失败:{}", ExceptionUtils.getErrorStackTrace(e));
+        }
+
+        // 二.同步grid
+        try {
+            statsDimService.syncCustomerGridDims(customerId);
+        } catch (Exception e) {
+            syncGridSuccess = false;
+            log.error("【同步客户相关维度】同步grid失败:{}", ExceptionUtils.getErrorStackTrace(e));
+        }
+
+        // 三.同步department
+        try {
+            statsDimService.syncCustomerDepartmentDims(customerId);
+        } catch (Exception e) {
+            syncDepartmentSuccess = false;
+            log.error("【同步客户相关维度】同步department失败:{}", ExceptionUtils.getErrorStackTrace(e));
+        }
+
+        // 构造结果
+        HashMap<String, Boolean> r = new HashMap<>();
+        r.put("syncAgencySuccess", syncAgencySuccess);
+        r.put("syncGridSuccess", syncGridSuccess);
+        r.put("syncDepartmentSuccess", syncDepartmentSuccess);
+        
+        return new Result().ok(r);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java
index 8db5a46efb..a3cb1286a2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java
@@ -35,6 +35,7 @@ import java.util.List;
 public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity> {
 
     List<CustomerDepartmentEntity> listDepartmentsByCreatedTime(
+            @Param("customerId") String customerId,
             @Param("createdTimeFrom") Date createdTimeFrom,
             @Param("createdTimeTo") Date createdTimeTo);
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java
index 688807259e..1677dc8f76 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java
@@ -49,7 +49,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @param end
      * @return
      */
-    List<CustomerGridEntity> listGridsByCreateTime(@Param("start") Date start, @Param("end") Date end);
+    List<CustomerGridEntity> listGridsByCreateTime(@Param("customerId") String customerId, @Param("start") Date start, @Param("end") Date end);
 
     /**
      * @Description  查询机关下的网格总数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
index a16f40e204..7f2ed28d1e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
@@ -19,6 +19,7 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     List<CustomerAgencyEntity> listAllEntities();
 
     List<CustomerAgencyEntity> listAgenciesByCreateTime(
+            @Param("customerId") String customerId,
             @Param("statsStartTime") Date statsStartTime,
             @Param("statsEndTime") Date statsEndTime);
     List<AgencySubTreeDto> selectAllAgency();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java
index 0bdac4cb04..9e9a37de5a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java
@@ -12,4 +12,22 @@ public interface StatsDimService {
     void initDepartmentDim();
 
     void customerInitProjectCategory();
+
+    /**
+     * 同步客户的组织维度
+     * @param customerId
+     */
+    void syncCustomerAgencyDims(String customerId);
+
+    /**
+     * 同步客户的网格维度
+     * @param customerId
+     */
+    void syncCustomerGridDims(String customerId);
+
+    /**
+     * 同步客户的部门维度
+     * @param customerId
+     */
+    void syncCustomerDepartmentDims(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
index 696b6fb221..c67213d6d2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
@@ -83,7 +83,7 @@ public class EIDimServiceImpl implements EIDimService {
             startTime = e.getCreatedTime();
         }
 
-        return originCustomerAgencyService.listAgenciesByCreateTime(startTime, endTime);
+        return originCustomerAgencyService.listAgenciesByCreateTime(null, startTime, endTime);
     }
 
     @Override
@@ -125,7 +125,7 @@ public class EIDimServiceImpl implements EIDimService {
             startTime = lastAddDept.getCreatedTime();
         }
 
-        return originCustomerDepartmentService.listDepartmentsByCreatedTime(startTime, endTime);
+        return originCustomerDepartmentService.listDepartmentsByCreatedTime(null, startTime, endTime);
     }
 
     @Override
@@ -179,6 +179,6 @@ public class EIDimServiceImpl implements EIDimService {
             startTime = lastAddGrid.getCreatedTime();
         }
 
-        return customerGridService.listGridsByCreateTime(startTime, endTime);
+        return customerGridService.listGridsByCreateTime(null, startTime, endTime);
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
index d81f5afb89..d9081c7c6f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.RobotConstant;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.entity.crm.CustomerEntity;
@@ -78,10 +79,10 @@ public class StatsDimServiceImpl implements StatsDimService {
         Date now = new Date();
         if (lastDimEntity == null) {
             // 首次初始化
-            grids = customerGridService.listGridsByCreateTime(null, now);
+            grids = customerGridService.listGridsByCreateTime(null, null, now);
         } else {
             Date lastInitTime = lastDimEntity.getCreatedTime();
-            grids = customerGridService.listGridsByCreateTime(lastInitTime, now);
+            grids = customerGridService.listGridsByCreateTime(null, lastInitTime, now);
         }
 
         return convertCustomerGrid2GridDim(grids, now);
@@ -127,7 +128,7 @@ public class StatsDimServiceImpl implements StatsDimService {
      * @param initTime 创建时间会用来作为下一次查询的输入条件，因此必须和本次初始化查询的endTime一致
      * @return
      */
-    private List<DimGridEntity> convertCustomerGrid2GridDim(List<CustomerGridEntity> grids, Date initTime) {
+    public List<DimGridEntity> convertCustomerGrid2GridDim(List<CustomerGridEntity> grids, Date initTime) {
         return grids.stream().map(grid -> {
             DimGridEntity dimGrid = new DimGridEntity();
             dimGrid.setAgencyId(grid.getPid());
@@ -168,7 +169,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastInitTime = latestCreatedAgencyDim.getCreatedTime();
         }
 
-        return customerAgencyService.listAgenciesByCreateTime(lastInitTime, endDate);
+        return customerAgencyService.listAgenciesByCreateTime(null, lastInitTime, endDate);
     }
 
     /**
@@ -268,7 +269,7 @@ public class StatsDimServiceImpl implements StatsDimService {
         if (lastCreatedDeptDim != null) {
             lastInitTime = lastCreatedDeptDim.getCreatedTime();
         }
-        return departmentService.listDepartmentsByCreatedTime(lastInitTime, now);
+        return departmentService.listDepartmentsByCreatedTime(null, lastInitTime, now);
     }
 
     public List<CustomerDepartmentEntity> listUpdatedDepartments(Date initTime) {
@@ -321,4 +322,55 @@ public class StatsDimServiceImpl implements StatsDimService {
         }
         return new ArrayList<>();
     }
+
+    @Override
+    public void syncCustomerAgencyDims(String customerId) {
+        // 1.列出现有的agency 维度id列表
+        List<String> dimAgencyIds = dimAgencyService.listAgencyIds(customerId);
+        
+        // 2.查询业务表的agency列表
+        Date endDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+        List<CustomerAgencyEntity> bizAgencies = customerAgencyService.listAgenciesByCreateTime(customerId, null, endDate);
+
+        // 3.将没有同步过来的插入到dim表。创建和更新时间存为今天凌晨
+        for (CustomerAgencyEntity bizAgency : bizAgencies) {
+            if (!dimAgencyIds.contains(bizAgency.getId())) {
+                dimAgencyService.initAgencyAllDim(bizAgency, endDate);
+                dimAgencyService.initAgencySelfDim(bizAgency, endDate);
+            }
+        }
+    }
+
+    @Override
+    public void syncCustomerGridDims(String customerId) {
+        // 1.列出现有的grid维度id列表
+        List<String> dimGridIds = dimGridService.listGridIds(customerId);
+
+        // 2.查询业务表的grid列表
+        // 时间截止到今天凌晨，防止把今天的数据同步过来，影响定时任务查询，漏掉其他客户的数据
+        Date endDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+        List<CustomerGridEntity> bizGrids = customerGridService.listGridsByCreateTime(customerId, null, endDate);
+
+        // 3.将没有同步过来的插入到dim表。创建和更新时间存为今天凌晨
+        List<CustomerGridEntity> grids2insert = bizGrids.stream().filter(bg -> !dimGridIds.contains(bg.getId())).collect(Collectors.toList());
+        List<DimGridEntity> dimGridEntities = convertCustomerGrid2GridDim(grids2insert, endDate);
+
+        dimGridEntities.forEach(g -> dimGridService.insert(g));
+    }
+
+    @Override
+    public void syncCustomerDepartmentDims(String customerId) {
+        // 1.列出现有的grid维度id列表
+        List<String> dimDeptIds = dimDepartmentService.listDepartmentIds(customerId);
+
+        // 2.查询业务表的grid列表
+        // 时间截止到今天凌晨，防止把今天的数据同步过来，影响定时任务查询，漏掉其他客户的数据
+        Date endDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+        List<CustomerDepartmentEntity> bizDepts = departmentService.listDepartmentsByCreatedTime(customerId, null, endDate);
+
+        List<CustomerDepartmentEntity> depts2insert = bizDepts.stream().filter(bd -> !dimDeptIds.contains(bd.getId())).collect(Collectors.toList());
+
+        // 3.将没有同步过来的插入到dim表。创建和更新时间存为今天凌晨
+        dimDepartmentService.initDepartmentDims(depts2insert, new ArrayList<>(), endDate);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
index 156b7294a9..4a47055e82 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
@@ -10,7 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 public interface CustomerAgencyService {
-    List<CustomerAgencyEntity> listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime);
+    List<CustomerAgencyEntity> listAgenciesByCreateTime(String customerId, Date statsStartTime, Date statsEndTime);
 
     List<CustomerAgencyEntity> listAgenciesByUpdatedTime(Date updatedTime, Date now);
 
@@ -66,4 +66,11 @@ public interface CustomerAgencyService {
      * @Description 批量查询客户组织基础信息
      **/
     List<CustomerAgencyDTO> getAgencyBaseInfo(GridBaseInfoFormDTO formDTO);
+
+    /**
+     * 列出agencyId列表
+     * @param customerId
+     * @return
+     */
+    List<String> listAgencyIds(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java
index f7d5900682..45650a3864 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface CustomerDepartmentService {
 
-    List<CustomerDepartmentEntity> listDepartmentsByCreatedTime(Date createdTimeFrom, Date createdTimeTo);
+    List<CustomerDepartmentEntity> listDepartmentsByCreatedTime(String customerId, Date createdTimeFrom, Date createdTimeTo);
 
     List<CustomerDepartmentEntity> listDepartmentsByUpdatedTime(Date startTime, Date endTime);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
index f6131f2906..d4aedd0ba2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
@@ -23,7 +23,7 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @return
      * @Param("start") Date start, @Param("end") Date end
      */
-    List<CustomerGridEntity> listGridsByCreateTime(Date start, Date end);
+    List<CustomerGridEntity> listGridsByCreateTime(String customerId, Date start, Date end);
 
     /**
      * @Description  查询机关下有多少网格
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
index 3e06682b15..af86e32a74 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
@@ -1,5 +1,6 @@
 package com.epmet.service.org.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -25,6 +26,7 @@ import org.springframework.util.StringUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @DataSource(DataSourceConstant.GOV_ORG)
@@ -40,8 +42,8 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
     private CustomerGridService customerGridService;
 
     @Override
-    public List<CustomerAgencyEntity> listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime) {
-        return customerAgencyDao.listAgenciesByCreateTime(statsStartTime, statsEndTime);
+    public List<CustomerAgencyEntity> listAgenciesByCreateTime(String customerId, Date statsStartTime, Date statsEndTime) {
+        return customerAgencyDao.listAgenciesByCreateTime(customerId, statsStartTime, statsEndTime);
     }
 
     @Override
@@ -283,4 +285,15 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
         return customerAgencyDao.getAgencyBaseInfo(formDTO);
     }
 
+    @Override
+    public List<String> listAgencyIds(String customerId) {
+        LambdaQueryWrapper<CustomerAgencyEntity> query = new LambdaQueryWrapper<>();
+        query.eq(CustomerAgencyEntity::getCustomerId, customerId);
+        query.select(CustomerAgencyEntity::getId);
+        
+        return customerAgencyDao.selectObjs(query)
+                .stream()
+                .map(o -> o.toString())
+                .collect(Collectors.toList());
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java
index 0a7a4e380a..2427d025dc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java
@@ -25,8 +25,8 @@ public class CustomerDepartmentServiceImpl implements CustomerDepartmentService
      * @return
      */
     @Override
-    public List<CustomerDepartmentEntity> listDepartmentsByCreatedTime(Date createdTimeFrom, Date createdTimeTo) {
-        return departmentDao.listDepartmentsByCreatedTime(createdTimeFrom, createdTimeTo);
+    public List<CustomerDepartmentEntity> listDepartmentsByCreatedTime(String customerId, Date createdTimeFrom, Date createdTimeTo) {
+        return departmentDao.listDepartmentsByCreatedTime(customerId, createdTimeFrom, createdTimeTo);
     }
 
     @Override
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
index 76376efd82..956c5990bc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
@@ -34,8 +34,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     private IssueService issueService;
 
     @Override
-    public List<CustomerGridEntity> listGridsByCreateTime(Date start, Date end) {
-        return baseDao.listGridsByCreateTime(start, end);
+    public List<CustomerGridEntity> listGridsByCreateTime(String customerId, Date start, Date end) {
+        return baseDao.listGridsByCreateTime(customerId, start, end);
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
index e22b42c609..47e8ead12d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
@@ -187,4 +187,25 @@ public interface DimAgencyService extends BaseService<DimAgencyEntity> {
      * @return java.util.List<com.epmet.dto.stats.DimAgencyDTO>
      */
     List<DimAgencyDTO> getAgencyByLevel(String customerId, String level);
+
+    /**
+     * 查询agency维度已存在的id列表
+     * @param customerId
+     * @return
+     */
+    List<String> listAgencyIds(String customerId);
+
+    /**
+     * 初始化agency all 维度(all区分于self)
+     * @param agency
+     * @param initTime
+     */
+    void initAgencyAllDim(CustomerAgencyEntity agency, Date initTime);
+
+    /**
+     * 初始化agency self 维度(self区分于all)
+     * @param agency
+     * @param initTime
+     */
+    void initAgencySelfDim(CustomerAgencyEntity agency, Date initTime);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java
index c1d5478153..3fae407d7c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java
@@ -120,4 +120,11 @@ public interface DimDepartmentService extends BaseService<DimDepartmentEntity> {
      */
     List<DimDepartmentDTO> getDistrictDepByCustomer(String customerId);
 
+    /**
+     * 查询部门维度id列表
+     * @param customerId
+     * @return
+     */
+    List<String> listDepartmentIds(String customerId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
index f98f0dd75a..3702b09ceb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
@@ -148,4 +148,12 @@ public interface DimGridService extends BaseService<DimGridEntity> {
      * @date 2020.09.20 13:01
      **/
     List<GridAttributesResultDTO> getGridAttributes(String customerId,List<String> gridIds);
+
+    /**
+     * 查询网格维度ID列表
+     * @param customerId
+     * @return
+     */
+    List<String> listGridIds(String customerId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
index 99e6ba794c..90c8a46324 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.stats.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -47,6 +48,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 机关维度
@@ -158,6 +160,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
         lastExecRecordDao.updateExecTimeBySubject(new Date(), StatsSubject.DIM_AGENCY);
     }
 
+    @Override
     public void initAgencyAllDim(CustomerAgencyEntity agency, Date initTime) {
         DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
         dimAgencyEntity.setCode(agency.getCode());
@@ -180,6 +183,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
      * 初始化机关单位本身的维度(不包含本身)
      * @param agency
      */
+    @Override
     public void initAgencySelfDim(CustomerAgencyEntity agency, Date initTime) {
         DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
         dimAgencyEntity.setAgencyName(agency.getOrganizationName());
@@ -293,4 +297,12 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
         return baseDao.selectDimAgencyByLevel(customerId, level);
     }
 
+    @Override
+    public List<String> listAgencyIds(String customerId) {
+        LambdaQueryWrapper<DimAgencyEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DimAgencyEntity::getCustomerId, customerId);
+        queryWrapper.select(DimAgencyEntity::getId);
+
+        return baseDao.selectObjs(queryWrapper).stream().map(o -> o.toString()).collect(Collectors.toList());
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
index 28d1026a17..47e474c4aa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.stats.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -43,6 +44,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 客户部门维度
@@ -169,4 +171,13 @@ public class DimDepartmentServiceImpl extends BaseServiceImpl<DimDepartmentDao,
     public List<DimDepartmentDTO> getDistrictDepByCustomer(String customerId) {
         return baseDao.getDistrictDepByCustomer(customerId);
     }
+
+    @Override
+    public List<String> listDepartmentIds(String customerId) {
+        LambdaQueryWrapper<DimDepartmentEntity> query = new LambdaQueryWrapper<>();
+        query.eq(DimDepartmentEntity::getCustomerId, customerId);
+        query.select(DimDepartmentEntity::getId);
+
+        return baseDao.selectObjs(query).stream().map(d -> d.toString()).collect(Collectors.toList());
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
index df149feb02..0a0fb86ecf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.stats.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -45,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 客户网格维度
@@ -193,4 +195,14 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
 
        return baseDao.selectGridAttributes(customerId,gridIds);
     }
+
+    @Override
+    public List<String> listGridIds(String customerId) {
+        LambdaQueryWrapper<DimGridEntity> query = new LambdaQueryWrapper<>();
+        query.eq(DimGridEntity::getCustomerId, customerId);
+        query.select(DimGridEntity::getId);
+        
+        return baseDao.selectObjs(query).stream().map(o -> o.toString()).collect(Collectors.toList());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml
index 0e373b7d3d..1df3ef3a1a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml
@@ -13,6 +13,9 @@
         dept.AGENCY_ID = ca.id and ca.DEL_FLAG='0')
         <where>
             dept.DEL_FLAG = 0
+            <if test="customerId != null and customerId != ''">
+                AND dept.CUSTOMER_ID = #{customerId}
+            </if>
             <if test="createdTimeFrom != null">
                 AND dept.CREATED_TIME >= #{createdTimeFrom}
             </if>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index 5b39b9e9a1..587b75120e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
@@ -10,6 +10,9 @@
         <where>
             DEL_FLAG = 0
             AND SYNC_FLAG='1'
+            <if test="customerId != null and customerId != ''">
+                AND CUSTOMER_ID = #{customerId}
+            </if>
             <if test="start != null">
                 AND CREATED_TIME >= #{start}
             </if>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index b43eea7bb1..aa337955ad 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -17,6 +17,9 @@
         <where>
             DEL_FLAG = 0
             AND SYNC_FLAG='1'
+            <if test="customerId != null and customerId !=''">
+                AND CUSTOMER_ID = #{customerId}
+            </if>
             <if test="statsStartTime != null">
                 AND CREATED_TIME >= #{statsStartTime}
             </if>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
index 98b5d1233e..adaa3ed3f1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
@@ -92,9 +92,7 @@ public class BuildingController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.AddShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
-//        String customerId = "123123";
-
-        buildingService.AddBuilding(customerId,formDTO);
+        buildingService.addBuilding(customerId,formDTO);
         return new Result().ok("保存成功");
     }
 
@@ -105,7 +103,7 @@ public class BuildingController {
         ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
 //        String customerId = "123123";
-        buildingService.UpdateBuilding(customerId,formDTO);
+        buildingService.updateBuilding(customerId,formDTO);
         return new Result().ok("修改成功");
     }
 
@@ -114,7 +112,7 @@ public class BuildingController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.DeleteGroup.class);
         String buildingId = formDTO.getBuildingId();
-        buildingService.DelBuilding(buildingId);
+        buildingService.delBuilding(buildingId);
         return new Result();
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index ab0b6c646f..7b6c7e44c0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -32,7 +32,6 @@ import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.excel.IcHouseExcel;
 import com.epmet.service.HouseService;
-import com.epmet.service.NeighborHoodService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,10 +55,6 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("house")
 public class HouseController {
-    
-
-    @Autowired
-    private NeighborHoodService neighborHoodService;
 
     @Autowired
     private HouseService houseService;
@@ -151,10 +146,9 @@ public class HouseController {
         List<Integer> numList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(failList)){
             for ( IcHouseExcel entity : failList) {
-                log.error("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
+                log.warn("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
                 numList.add(entity.getRowNum());
             }
-            //return new Result().error(8001,failList.get(0).getErrorMsg());
         }
         List<IcHouseExcel> result =importResult.getList();
 
@@ -173,4 +167,4 @@ public class HouseController {
     Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody Set<String> houseIds){
         return new Result<List<HouseInfoDTO>>().ok(houseService.queryListHouseInfo(houseIds));
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
index 1f54db3e1c..60c1651315 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
@@ -60,7 +60,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("neighborhood")
 public class NeighborHoodController {
-    
+
     @Autowired
     private IcNeighborHoodService icNeighborHoodService;
     @Autowired
@@ -210,7 +210,7 @@ public class NeighborHoodController {
         List<Integer> numList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(failList)){
             for ( IcNeighborHoodExcel entity : failList) {
-                log.error("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
+                log.warn("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
                 numList.add(entity.getRowNum());
             }
             //return new Result().error(8001,failList.get(0).getErrorMsg());
@@ -231,4 +231,4 @@ public class NeighborHoodController {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
index 3a78628602..81b70a4bd2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
@@ -40,16 +40,16 @@ public interface BuildingService {
 
 
 
-    void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO);
+    void updateBuilding(String customerId, IcBulidingFormDTO formDTO);
 
     /**
      * 删除小区
      * @param buildingId
      */
-    void DelBuilding(String buildingId);
+    void delBuilding(String buildingId);
 
 
-    void AddBuilding(String customerId, IcBulidingFormDTO formDTO);
+    void addBuilding(String customerId, IcBulidingFormDTO formDTO);
 
     List<BuildingTreeLevelDTO> treeList(String customerId);
 
@@ -62,4 +62,4 @@ public interface BuildingService {
     List<BuildingResultDTO> buildingListByIds(List<String> buildingIdList);
 
     BuildingResultPagedDTO buildinglistbyidsPage(List<String> buildingIdList, Integer pageNo, Integer pageSize);
-}
\ No newline at end of file
+}
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 24fe5e520a..c51ffbb4f1 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
@@ -1,9 +1,11 @@
 package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -70,7 +72,7 @@ public class BuildingServiceImpl implements BuildingService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void AddBuilding(String customerId, IcBulidingFormDTO formDTO) {
+    public void addBuilding(String customerId, IcBulidingFormDTO formDTO) {
         //同一小区下不能存在楼栋名字一样的
         Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null);
         if (null != count && count > 0) {
@@ -152,8 +154,11 @@ public class BuildingServiceImpl implements BuildingService {
 
 
         //3.获取网格下的所有小区
-        List<String> gridIdList = customerGridList.stream().map(a->a.getId()).collect(Collectors.toList());
-        List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper<IcNeighborHoodEntity>().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList));
+        List<String> gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<IcNeighborHoodEntity>().lambda()
+                .in(IcNeighborHoodEntity::getGridId, gridIdList)
+                .orderByAsc(IcNeighborHoodEntity::getCreatedTime);
+        List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper);
         if(CollectionUtils.isEmpty(icNeighborHoodList)){
             agencyList.addAll(gridList);
             return covertToTree(customerAgency,agencyList);
@@ -171,8 +176,11 @@ public class BuildingServiceImpl implements BuildingService {
         }).collect(Collectors.toList());
 
         //3.获取小区下的所有楼宇
-        List<String> neighborHoodIdList = icNeighborHoodList.stream().map(a->a.getId()).collect(Collectors.toList());
-        List<IcBuildingEntity> icBuildingList = icBuildingDao.selectList(new QueryWrapper<IcBuildingEntity>().lambda().in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList));
+        List<String> neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<IcBuildingEntity> buildingQueryWrapper = new QueryWrapper<IcBuildingEntity>().lambda()
+                .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList)
+                .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName);
+        List<IcBuildingEntity> icBuildingList = icBuildingDao.selectList(buildingQueryWrapper);
 
         if(CollectionUtils.isEmpty(neighborHoodIdList)){
             agencyList.addAll(gridList);
@@ -193,14 +201,6 @@ public class BuildingServiceImpl implements BuildingService {
             return buildingTreeLevelDTO;
         }).collect(Collectors.toList());
 
-
-
-
-        //组织
-//        gridList.stream()
-//        Map<String, List<BuildingTreeLevelDTO>> gridMap = gridList.stream().collect(Collectors.groupingBy(e -> e.getPId()));
-//        List<BuildingTreeLevelDTO> allList = agencyList.addAll(gridList)
-
         agencyList.addAll(gridList);
         agencyList.addAll(neighbourHoodList);
         agencyList.addAll(buildingList);
@@ -365,25 +365,9 @@ public class BuildingServiceImpl implements BuildingService {
     private IPage<Map<String, Object>> searchBuilding(ListIcNeighborHoodFormDTO formDTO) {
         IPage<IcBuildingEntity> page = new Page<IcBuildingEntity>(formDTO.getPageNo(),formDTO.getPageSize());
 
-//        IcNeighborHoodEntity neighbor = new IcNeighborHoodEntity();
-//        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
-
-//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
-//        neighborHoodEntityQueryWrapper.lambda()
-//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
-//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
-//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
-//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
-
-
         IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
         building.setDelFlag("0");
-//        QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
-//
-//        buildingEntityQueryWrapper.lambda()
-//                .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
-//                .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
-//        buildingEntityQueryWrapper.eq("a.DEL_FLAG","0");
+
         IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         IPage<Map<String, Object>> mapIPage = icBuildingDao.searchBuildingByPage(page, building, house);
         List<Map<String, Object>> records = mapIPage.getRecords();
@@ -428,7 +412,7 @@ public class BuildingServiceImpl implements BuildingService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO) {
+    public void updateBuilding(String customerId, IcBulidingFormDTO formDTO) {
         //同一小区下不能存在楼栋名字一样的
         Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId());
         if (null != count && count > 0) {
@@ -484,7 +468,7 @@ public class BuildingServiceImpl implements BuildingService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void DelBuilding(String buildingId) {
+    public void delBuilding(String buildingId) {
         //如果存在房屋，无法删除
         List<IcHouseEntity> icHouseEntities = icHouseDao.selectList(new QueryWrapper<IcHouseEntity>().lambda().eq(IcHouseEntity::getBuildingId, buildingId));
         if(!CollectionUtils.isEmpty(icHouseEntities)){
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 4ff3bb2948..69a2000d97 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -201,9 +201,7 @@ public class HouseServiceImpl implements HouseService {
         //3.保存
         icHouseService.insertBatch(houseEntityList);
 
-        /*if(!"".equals(str)){
-            return new Result().error(9999, str.append("不存在").toString());
-        }*/
+
         return numList;
 
     }
@@ -252,28 +250,6 @@ public class HouseServiceImpl implements HouseService {
     private IPage<Map<String, Object>> searchHouse(ListIcNeighborHoodFormDTO formDTO) {
         IPage<IcHouseEntity> page = new Page<IcHouseEntity>(formDTO.getPageNo(),formDTO.getPageSize());
 
-//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
-//        neighborHoodEntityQueryWrapper.lambda()
-//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
-//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
-//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
-//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
-//        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
-
-
-//        QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
-//        buildingEntityQueryWrapper.lambda()
-//                .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
-//                .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
-//        IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
-
-
-//        QueryWrapper<IcHouseEntity> houseEntityQueryWrapper = new QueryWrapper<>();
-//        houseEntityQueryWrapper.lambda()
-//                .eq(!StringUtils.isEmpty(formDTO.getOwnerName()),IcHouseEntity::getOwnerName,formDTO.getOwnerName())
-//                .like(!StringUtils.isEmpty(formDTO.getOwnerPhone()),IcHouseEntity::getOwnerPhone,formDTO.getOwnerPhone());
-//        houseEntityQueryWrapper.eq("a.DEL_FLAG","0");
-
         IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         house.setDelFlag("0");
 
@@ -281,7 +257,6 @@ public class HouseServiceImpl implements HouseService {
         List<Map<String, Object>> records = mapIPage.getRecords();
         records.forEach(item->{
             item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));
-//            item.put("rentFlag", HouseRentFlagEnums.getTypeValue(item.get("rentFlagKey") ));
             item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey")));
         });
         return mapIPage;
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 dd5e742342..5c68f83dba 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
@@ -133,14 +133,6 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
 
         IPage<IcNeighborHoodEntity> page = new Page<IcNeighborHoodEntity>(formDTO.getPageNo(),formDTO.getPageSize());
 
-//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
-//        neighborHoodEntityQueryWrapper.lambda()
-//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
-//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
-//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
-//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
-//        neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0");
-
         IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
         IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         neighbor.setDelFlag("0");
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index fd36cfc673..be7125e80c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -323,22 +323,8 @@
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
             agency.CUSTOMER_ID as customerId,
-            ( CASE WHEN agency.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE agency.longitude
-                END
-            ) longitude,
-            ( CASE WHEN agency.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE agency.latitude
-                END
-            ) latitude
+            agency.longitude,
+            agency.latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE
@@ -363,22 +349,8 @@
             cg.id AS gridId,
             cg.GRID_NAME AS gridName,
             cg.CUSTOMER_ID AS customerId,
-            ( CASE WHEN ca.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.longitude
-                END
-            ) longitude,
-            ( CASE WHEN ca.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.latitude
-                END
-            ) latitude
+            ca.longitude,
+            ca.latitude
         FROM
             customer_grid cg
         INNER JOIN customer_agency ca ON cg.PID = ca.ID
@@ -393,22 +365,8 @@
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
             agency.CUSTOMER_ID as customerId,
-            ( CASE WHEN agency.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE agency.longitude
-                END
-            ) longitude,
-            ( CASE WHEN agency.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE agency.latitude
-                END
-            ) latitude
+            agency.longitude,
+            agency.latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE
@@ -423,22 +381,8 @@
 	        ca.pids pids,
 	        ca.pid pid,
 	        ca.level level,
-	        ( CASE WHEN ca.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.longitude
-                END
-            ) longitude,
-            ( CASE WHEN ca.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.latitude
-                END
-            ) latitude
+	        ca.longitude,
+            ca.latitude
         FROM
             customer_agency ca
         INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index f605b5c71f..d4f3847235 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -94,7 +94,7 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-        order by a.CREATED_TIME asc
+        order by a.CREATED_TIME, a.BUILDING_NAME
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select
@@ -138,117 +138,6 @@
 
     </select>
 
-    <!--<select id="searchBuildingByPage" resultType="map">
-        select
-        a.ID as buildingId,
-        a.BUILDING_NAME as buildingName,
-        a.TOTAL_HOUSE_NUM as totalHouseNum,
-        a.TOTAL_FLOOR_NUM as totalFloorNum,
-        a.TOTAL_UNIT_NUM as totalUnitNum,
-        a.BUILDING_NAME as buildingType,
-        b.NEIGHBOR_HOOD_NAME as neighborHoodName
-        from ic_building a
-
-        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
-
-        <if test="neighbor.id != null and neighbor.id.trim() != ''">
-            AND b.ID = #{neighbor.id}
-        </if>
-        <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
-            AND b.AGENCY_ID = #{neighbor.agencyId}
-        </if>
-        <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
-            AND b.GRID_ID = #{neighbor.gridId}
-        </if>
-        <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
-            AND b.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
-        </if>
-
-        <where>
-
-            <if test="building.id != null and building.id.trim() != ''">
-                AND a.ID = #{building.id}
-            </if>
-            <if test="building.buildingName != null and building.buildingName.trim() != ''">
-                AND a.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
-            </if>
-            <if test="building.delFlag != null and building.delFlag.trim() != ''">
-                AND a.DEL_FLAG = #{building.delFlag}
-            </if>
-        </where>
-
-    </select>-->
-
-
-    <!--<select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
-        select
-
-        a.BUILDING_NAME as buildingName,
-        a.TOTAL_HOUSE_NUM as totalHouseNum,
-        a.TOTAL_FLOOR_NUM as totalFloorNum,
-        a.TOTAL_UNIT_NUM as totalUnitNum,
-
-        b.NEIGHBOR_HOOD_NAME as neighborHoodName,
-        f.ORGANIZATION_NAME as agencyName,
-        g.GRID_NAME as gridName
-        from ic_building a
-
-        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
-        and b.ID in (
-            select c.id from ic_neighbor_hood c
-            INNER JOIN customer_agency d  on c.AGENCY_ID = d.ID
-            INNER JOIN customer_grid e  on c.GRID_ID = e.ID
-            ${ew.customSqlSegment}
-        )
-        LEFT JOIN customer_agency f on b.AGENCY_ID = f.ID
-        LEFT JOIN customer_grid g on b.GRID_ID = g.ID
-        ${ew1.customSqlSegment}
-    </select>-->
-    <!--<select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
-        select
-        a.ID as buildingId,
-        a.BUILDING_NAME as buildingName,
-        a.TOTAL_HOUSE_NUM as totalHouseNum,
-        a.TOTAL_FLOOR_NUM as totalFloorNum,
-        a.TOTAL_UNIT_NUM as totalUnitNum,
-        a.BUILDING_NAME as buildingType,
-        b.NEIGHBOR_HOOD_NAME as neighborHoodName,
-        c.ORGANIZATION_NAME as agencyName,
-        d.GRID_NAME as gridName
-        from ic_building a
-
-        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
-        LEFT JOIN customer_agency c on b.AGENCY_ID = c.ID
-        LEFT JOIN customer_grid c on b.GRID_ID = d.ID
-
-        <if test="neighbor.id != null and neighbor.id.trim() != ''">
-            AND b.ID = #{neighbor.id}
-        </if>
-        <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
-            AND b.AGENCY_ID = #{neighbor.agencyId}
-        </if>
-        <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
-            AND b.GRID_ID = #{neighbor.gridId}
-        </if>
-        <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
-            AND b.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
-        </if>
-
-        <where>
-
-            <if test="building.id != null and building.id.trim() != ''">
-                AND a.ID = #{building.id}
-            </if>
-            <if test="building.buildingName != null and building.buildingName.trim() != ''">
-                AND a.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
-            </if>
-            <if test="building.delFlag != null and building.delFlag.trim() != ''">
-                AND a.DEL_FLAG = #{building.delFlag}
-            </if>
-        </where>
-    </select>-->
-
-
     <select id="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">
 
         SELECT
@@ -330,7 +219,6 @@
             #{val}
         </foreach>
         order by gridName,neighborHoodName,buildingName
-
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 5e91e7f1cd..f997a5cf3a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -144,6 +144,7 @@
             </if>
 
         </where>
+        ORDER BY  CAST(d.UNIT_NUM AS SIGNED), a.DOOR_NAME
     </select>
     <select id="searchAllHouse" resultType="com.epmet.excel.IcHouseExcel">
         select
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 ea950eb90b..73c23350d7 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
@@ -106,6 +106,7 @@
                 AND a.DEL_FLAG = #{neighbor.delFlag}
             </if>
         </where>
+        ORDER BY a.CREATED_TIME
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select
@@ -213,4 +214,4 @@
             and a.id !=#{neighborId}
         </if>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>