From 3bd38d18761c5a33fadf627d90a3b1a70aece6ae Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Jul 2022 10:51:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcBuildingServiceImpl.java | 2 +- .../com/epmet/service/impl/IcHouseServiceImpl.java | 2 +- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 9059a84eda..577e77c787 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/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 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 list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 5e20a7adf8..98e340221c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/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 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 list = baseDao.selectList(wrapper); if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); 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 7314031436..2f76bc1b7a 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 @@ -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 - convert(name using gbk) + SORT ASC, name + 0 ASC - houseRealCount desc, convert(name using gbk) + houseRealCount desc, name + 0 ASC - personRealCount desc, convert(name using gbk) + personRealCount desc, name + 0 ASC - differHouseCount desc, convert(name using gbk) + differHouseCount desc, name + 0 ASC convert(name using gbk) @@ -659,7 +660,7 @@ AND DOOR_NAME LIKE CONCAT('%', #{name}, '%') ORDER BY - DOOR_NAME + SORT, DOOR_NAME+0 From 14dca1f7acb72470ac8a502a85a4f63028dbe64a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 12 Jul 2022 15:23:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E5=88=86=E6=9E=90=E3=80=91?= =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AE=B6=E5=B1=9E=E5=88=97=E8=A1=A8=EF=BC=9A=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=89=BE=E4=B8=8D=E5=88=B0=E5=AE=B6=E5=B1=9E?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=A9=BA=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87=E9=92=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7dfdc190be..d6bfb0baba 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/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 getDependents(String idCard) { + // 家属列表 + ArrayList dependents = new ArrayList<>(); IcResiUserBriefDTO familyInfo = getResultDataOrThrowsException(userOpenFeignClient.findFamilyMemByIdCard(idCard), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【事件研判分析】查找家属失败", "【事件研判分析】查找家属失败"); + if (familyInfo == null) { + return dependents; + } + List houseUserList = familyInfo.getHouseUserList(); - ArrayList dependents = new ArrayList<>(); if (CollectionUtils.isEmpty(houseUserList)) { return dependents; }