From 5e226868ecf8ee0b0c4787861e6a23c5c4f36c0c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 22:25:14 +0800
Subject: [PATCH] 楼盘数据查询修改(多单元问题)

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..b55afde 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

--
Gitblit v1.9.3