From 7859dc22f82ff90aca3c0cebbab6fde0423290f9 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 16 Mar 2024 18:10:26 +0800
Subject: [PATCH] 重点人群标签查询

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 0296e5e..7d0d6d9 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -199,12 +199,24 @@
         LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
         LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
         LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+        LEFT JOIN jczz_user_house_label juhl ON juhl.household_id = jh.id
+        LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
         <where>
+            <if test="household.labelIdList !=null and household.labelIdList.size() >0 ">
+                and juhl.lable_type = 1
+                AND juhl.household_id IS NOT NULL
+                AND jl.id in
+                <foreach collection="household.labelIdList" item="code" open="(" close=")" separator=",">
+                    #{code}
+                </foreach>
+            </if>
             <if test="household.userId!=null">
                 AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code 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>

--
Gitblit v1.9.3