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 4e8ccd0e93..3476d797d1 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
@@ -157,7 +157,10 @@ public class BuildingServiceImpl implements BuildingService {
         //2.获取组织所在网格
         List<String> agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
 //        agencyIdList.add(customerAgency.getId());
-        List<CustomerGridEntity> customerGridList = customerGridDao.selectList(new QueryWrapper<CustomerGridEntity>().lambda().in(CustomerGridEntity::getPid, agencyIdList));
+        LambdaQueryWrapper<CustomerGridEntity> gridWrapper =  new LambdaQueryWrapper<>();
+        gridWrapper.in(CustomerGridEntity::getPid, agencyIdList);
+        gridWrapper.last("ORDER BY CAST(gridName AS SIGNED),CONVERT(gridName using gbk)");
+        List<CustomerGridEntity> customerGridList = customerGridDao.selectList(gridWrapper);
 
         if (CollectionUtils.isEmpty(customerGridList)) {
             return covertToTree(customerAgency, agencyList);
@@ -182,7 +185,7 @@ public class BuildingServiceImpl implements BuildingService {
         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);
+                .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(NEIGHBOR_HOOD_NAME using gbk)");
         List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper);
         if (CollectionUtils.isEmpty(icNeighborHoodList)) {
             agencyList.addAll(gridList);
@@ -206,7 +209,7 @@ public class BuildingServiceImpl implements BuildingService {
         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);
+                .last("ORDER BY SORT, CAST(BUILDING_NAME AS SIGNED),CONVERT(BUILDING_NAME USING gbk)");
         List<IcBuildingEntity> icBuildingList = icBuildingDao.selectList(buildingQueryWrapper);
 
         if (CollectionUtils.isEmpty(neighborHoodIdList)) {
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 2cc2fcd73f..7387a73354 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
@@ -186,6 +186,7 @@
             ca.del_flag = '0'
             and
             CONCAT(':',ca.pids, ':') like  CONCAT('%:',#{agencyId},':%')
+        ORDER BY CAST(organization_name AS SIGNED),CONVERT(organization_name using gbk)
     </select>
 
     <select id="selectListByName" resultType="map">