From 7fa7302550e8dfba383634e4f13161e451667fe6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 08 Jan 2024 17:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 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 74c169b..4539a10 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -275,7 +275,8 @@
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 and jg.is_deleted = 0
- <where>
+ where jh.is_deleted = 0
+ and jh.name != '' and jh.name is not null
<if test="household.userId!=null">
AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
)
@@ -316,9 +317,7 @@
<if test="household.id!=null and household.id!=''">
and jh.id = #{household.id}
</if>
- and jh.is_deleted = 0
order by jh.create_time desc
- </where>
</select>
--
Gitblit v1.9.3