Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java

@@ -123,7 +123,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         }
         LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId);
-        wrapper.last("ORDER BY CONVERT ( BUILDING_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY SORT ASC, BUILDING_NAME+0 ASC");
         List<IcBuildingEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -120,7 +120,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
-        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY SORT ASC, DOOR_NAME+0 ASC");
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -529,6 +529,7 @@
         FROM (
             SELECT
                     a.ID,
+                    a.SORT,
                     a.BUILDING_NAME AS name,
                     IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitRealCount,
                     IFNULL(c.unitCount, 0) AS unitCount,
@@ -560,16 +561,16 @@
             ORDER BY
             <choose>
                 <when test='sort == "1"'>
-                    convert(name using gbk)
+                    SORT ASC, name + 0 ASC
                 </when>
                 <when test='sort == "2"'>
-                    houseRealCount desc, convert(name using gbk)
+                    houseRealCount desc, name + 0 ASC
                 </when>
                 <when test='sort == "3"'>
-                    personRealCount desc, convert(name using gbk)
+                    personRealCount desc, name + 0 ASC
                 </when>
                 <when test='sort == "4"'>
-                    differHouseCount desc, convert(name using gbk)
+                    differHouseCount desc, name + 0 ASC
                 </when>
                  <when test='sort == "5"'>
                     convert(name using gbk)
@@ -659,7 +660,7 @@
                 AND DOOR_NAME LIKE CONCAT('%', #{name}, '%')
             </if>
         ORDER BY
-            DOOR_NAME
+            SORT, DOOR_NAME+0
     </select>
 
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -631,15 +631,20 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
      * @return
      */
     private List<IcEventYpAnalysisResultDTO.Dependent> getDependents(String idCard) {
+        // 家属列表
+        ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
         IcResiUserBriefDTO familyInfo = getResultDataOrThrowsException(userOpenFeignClient.findFamilyMemByIdCard(idCard),
                 ServiceConstant.EPMET_USER_SERVER,
                 EpmetErrorCode.SERVER_ERROR.getCode(),
                 "【事件研判分析】查找家属失败",
                 "【事件研判分析】查找家属失败");
 
+        if (familyInfo == null) {
+            return dependents;
+        }
+
         List<HouseUserDTO> houseUserList = familyInfo.getHouseUserList();
 
-        ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
         if (CollectionUtils.isEmpty(houseUserList)) {
             return dependents;
         }