From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   92 ++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 5228875..0396abc 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -157,46 +157,49 @@
         LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
         LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
         LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
-        LEFT JOIN jczz_gridman jgm on jgm.grid_id=jg.id
-        WHERE
-        jh.is_deleted = 0
-        <if test="household.userId!=null">
-            and jgm.user_id = #{household.userId}
-        </if>
-        <if test="household.name!=null and household.name !=''">
-            and jh.name like concat('%',#{household.name},'%')
-        </if>
-        <if test="household.houseCode!=null and household.houseCode !=''">
-            and jh.house_code = #{household.houseCode}
-        </if>
-        <if test="household.phoneNumber!=null and household.phoneNumber !=''">
-            and jh.phone_number like concat('%',#{household.phoneNumber},'%')
-        </if>
-        <if test="household.idCard!=null and household.idCard !=''">
-            and jh.id_card like concat('%',#{household.idCard},'%')
-        </if>
-        <if test="household.aoiName!=null and household.aoiName !=''">
-            and jhs.district_name like concat('%',#{household.aoiName},'%')
-        </if>
-        <if test="household.confirmFlag != null ">
-            and jh.confirm_flag = #{household.confirmFlag}
-        </if>
-        <if test="household.townStreetName!=null and household.townStreetName!=''">
-            and jda.town_street_name like concat('%',#{household.townStreetName},'%')
-        </if>
-        <if test="household.neiName!=null and household.neiName!=''">
-            and jda.nei_name like concat('%',#{household.neiName},'%')
-        </if>
-        <if test="household.housingRentalId != null ">
-            and jh.housing_rental_id = #{household.housingRentalId}
-        </if>
-        <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
-            AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
-        </if>
-        <if test="household.regionCode!=null and household.regionCode!=''">
-            and jg.community_code like concat('%',#{household.regionCode},'%')
-        </if>
-        order by jh.create_time desc
+        <where>
+            <if test="household.userId!=null">
+                AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+                )
+            </if>
+            <if test="household.name!=null and household.name !=''">
+                and jh.name like concat('%',#{household.name},'%')
+            </if>
+            <if test="household.houseCode!=null and household.houseCode !=''">
+                and jh.house_code = #{household.houseCode}
+            </if>
+            <if test="household.phoneNumber!=null and household.phoneNumber !=''">
+                and jh.phone_number like concat('%',#{household.phoneNumber},'%')
+            </if>
+            <if test="household.idCard!=null and household.idCard !=''">
+                and jh.id_card like concat('%',#{household.idCard},'%')
+            </if>
+            <if test="household.aoiName!=null and household.aoiName !=''">
+                and jhs.district_name like concat('%',#{household.aoiName},'%')
+            </if>
+            <if test="household.confirmFlag != null ">
+                and jh.confirm_flag = #{household.confirmFlag}
+            </if>
+            <if test="household.townStreetName!=null and household.townStreetName!=''">
+                and jda.town_street_name like concat('%',#{household.townStreetName},'%')
+            </if>
+            <if test="household.neiName!=null and household.neiName!=''">
+                and jda.nei_name like concat('%',#{household.neiName},'%')
+            </if>
+            <if test="household.housingRentalId != null ">
+                and jh.housing_rental_id = #{household.housingRentalId}
+            </if>
+            <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
+                AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
+            </if>
+            <if test="household.regionCode!=null and household.regionCode!=''">
+                and jg.community_code like concat('%',#{household.regionCode},'%')
+            </if>
+            and jh.is_deleted = 0
+            order by jh.create_time desc
+        </where>
+
+
     </select>
 
     <!--查询房屋集合信息-->
@@ -427,5 +430,14 @@
         GROUP BY age
     </select>
 
+    <!--查询所有未入库的业主信息-->
+    <select id="getNotInsertUserHousehold" resultType="org.springblade.modules.house.entity.HouseholdEntity">
+        select jh.* from jczz_household jh
+        where jh.is_deleted = 0
+        and jh.relationship = 1
+        and jh.associated_user_id is null
+        and jh.phone_number !=''
+        and length(jh.name)&lt;=12
+    </select>
 
 </mapper>

--
Gitblit v1.9.3