From 25df5530b89fc57a3f32a0e4c706bb40d3e4b415 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 Nov 2023 17:27:58 +0800
Subject: [PATCH] 标签控制+通知详情优化

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |   11 +++++++----
 1 files changed, 7 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 e987cc5..eaa6e46 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -138,7 +138,8 @@
             and floor != ''
             and house_name != ''
             and doorplate_type = '户室牌'
-            and building_code = #{code}
+            and building_code = #{houseParam.code}
+            <include refid="filterHouseGrid"/>
         )
         union all
         (
@@ -146,9 +147,10 @@
             '' as realName,'' as roleType,2 as addressType
             from jczz_doorplate_address
             where 1=1
-            and building_code = #{code}
+            and building_code = #{houseParam.code}
             and building_name != ''
             and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+            <include refid="filterHouseGrid"/>
         )
     </select>
 
@@ -216,9 +218,10 @@
       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}
+      and street_ru_code = #{houseParam.code}
+      and nei_code = #{houseParam.name}
       and aoi_code is null
+      <include refid="filterHouseGrid"/>
       order by doorplate_num,sub_door_plate_no
     </select>
 

--
Gitblit v1.9.3