From c9b71ca2cd9a71a7b9f2e5669f60bfaece4ad67b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 19 Mar 2024 10:18:42 +0800
Subject: [PATCH] 集成test4j 图片识别
---
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 0296e5e..1b11184 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -199,16 +199,28 @@
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>
- <if test="volunteerOrg != null and volunteerOrg != ''">
+ <if test="household.volunteerOrg != null and household.volunteerOrg != ''">
and jh.volunteer_org like concat('%',#{household.volunteerOrg},'%')
</if>
<if test="household.houseCode!=null and household.houseCode !=''">
--
Gitblit v1.9.3