From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 dc5c517..3ff0bb8 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -75,11 +75,10 @@
<!--根据小区名称查询楼栋/商铺集合-->
<select id="getBuildingList" resultType="org.springblade.common.node.TreeNode" >
(
- select building_code as id,building_name as name,1 as addressType from jczz_doorplate_address
+ select building_code as id,ifnull(building_name,'1栋') as name,1 as addressType from jczz_doorplate_address
where 1=1
and aoi_code = #{code}
and building_code !=''
- and building_name !=''
and doorplate_type = '户室牌'
group by building_code,building_name
order by building_name
@@ -98,7 +97,8 @@
<select id="getUnitHouseholdList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode" >
(
select
- jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,jda.address_code addressCode,
+ ifnull(jda.unit_name,"未知单元") unitName,jda.unit_code unitCode,jda.floor,jda.house_name as houseNo,
+ jda.address_code addressCode,
jh.name as realName,jh.role_type as roleType,1 as addressType
from jczz_doorplate_address jda
left join
@@ -112,7 +112,7 @@
)
union all
(
- select address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
+ select '' as unitName,address_code as unitCode,doorplate_name as floor,'' as houseNo,address_code as addressCode,
'' as realName,'' as roleType,2 as addressType
from jczz_doorplate_address
where 1=1
@@ -181,7 +181,9 @@
<!--根据街路巷编号查询街路巷门牌名称集合-->
<select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
- select address_code as addressCode,concat(doorplate_num,sub_door_plate_no) as floor from jczz_doorplate_address
+ select address_code as addressCode,
+ IFNULL(CONCAT(doorplate_num,sub_door_plate_no), IF(doorplate_num IS NULL, sub_door_plate_no, doorplate_num)) as floor
+ from jczz_doorplate_address
where 1=1
and street_ru_code = #{code}
and nei_code = #{name}
--
Gitblit v1.9.3