From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index d35b482..dc5c517 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -102,7 +102,7 @@
jh.name as realName,jh.role_type as roleType,1 as addressType
from jczz_doorplate_address jda
left join
- (select house_code,name,role_type from jczz_household where role_type = '业主') jh
+ (select house_code,name,role_type from jczz_household where role_type = 1) jh
on jda.address_code = jh.house_code
where 1=1
and floor != ''
@@ -181,11 +181,12 @@
<!--根据街路巷编号查询街路巷门牌名称集合-->
<select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
- select address_code as addressCode,doorplate_name as floor from jczz_doorplate_address
+ select address_code as addressCode,concat(doorplate_num,sub_door_plate_no) as floor from jczz_doorplate_address
where 1=1
and street_ru_code = #{code}
and nei_code = #{name}
and aoi_code is null
+ order by doorplate_num,sub_door_plate_no
</select>
<select id="getDoorplateAddressDetail"
--
Gitblit v1.9.3