From 514bda8dd09270c15919515091dee644d5a59518 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 11 Jan 2024 16:43:23 +0800
Subject: [PATCH] 重点人员及bug修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 8d97839..7251b49 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -718,7 +718,7 @@
</select>
- <select id="getKeynotePersonnelPage" resultType="org.springblade.modules.house.vo.HouseholdVO">
+ <select id="getKeynotePersonnelPage" resultMap="householdPageAndLabelMap">
SELECT
jh.id,
@@ -828,6 +828,18 @@
<if test="household.aoiCode!=null and household.aoiCode!=''">
and jhs.district_code = #{household.aoiCode}
</if>
+ AND EXISTS (
+ SELECT
+ *
+ FROM
+ jczz_user_house_label juhl
+ LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+ WHERE
+ juhl.lable_type = 1
+ AND jl.parent_id = 103
+ AND juhl.household_id = jh.id
+ AND juhl.label_id IS NOT NULL
+ )
and jh.is_deleted = 0
order by jh.create_time desc
</where>
--
Gitblit v1.9.3