From 8f5aeec641d916806553ef9772d55e17e93db150 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 15 Jul 2024 18:28:39 +0800
Subject: [PATCH] 代码优化

---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 34bab98..59ed4ca 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -464,10 +464,12 @@
         LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
         LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         <where>
-            jda.nei_code in
-            <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
-                #{code}
-            </foreach>
+            <if test="communityCodeList != null and communityCodeList.size()>0">
+                jda.nei_code in
+                <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
+                    #{code}
+                </foreach>
+            </if>
             and jda.doorplate_type = '户室牌'
             <choose>
                 <when test="(buildingCode != null  and buildingCode != '') or
@@ -844,12 +846,19 @@
 
     <!--查询未绑定网格或警格的数据-->
     <select id="getNotBindGridOrJwGridList" resultType="org.springblade.modules.house.entity.HouseEntity">
-        select id,lng,lat from jczz_house where is_deleted = 0 and lng != ''
+        SELECT
+        jh.id,
+        IFNULL(jh.lng,jda.x) lng,
+        IFNULL(jh.lat,jda.y) lat
+        FROM
+        jczz_house jh INNER JOIN jczz_doorplate_address jda on jda.address_code=jh.house_code
+        WHERE
+        jh.is_deleted = 0
         <if test="type == 1">
-            and grid_code is null
+            and jh.grid_code is null
         </if>
         <if test="type == 2">
-            and jw_grid_code is null
+            and jh.jw_grid_code is null
         </if>
     </select>
 

--
Gitblit v1.9.3