From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |   16 ++++++++++++----
 1 files changed, 12 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 a04fcaa..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>
 
@@ -252,4 +255,9 @@
         </if>
     </select>
 
+    <!--查询社区信息-->
+    <select id="getAllDoorplateAddress" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+        select * from jczz_doorplate_address where nei_name = #{name}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3