From c255e37f451939925946b1c2f29a791ddf25efce Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 27 Dec 2023 17:57:16 +0800
Subject: [PATCH] 公益报名+议事
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index f63f335..604cc44 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -299,23 +299,26 @@
FROM
jczz_house_rental jhr
LEFT JOIN jczz_doorplate_address jda ON jhr.house_code = jda.address_code
- WHERE
- jhr.is_deleted = 0
- <if test="neiCode != null and neiCode != ''">
- and jda.nei_code = #{neiCode}
- </if>
- <if test="userId != null">
- AND jhr.house_code IN (
- SELECT
- jgr.house_code
- FROM
- jczz_grid_range jgr
- LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
- LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
- WHERE
- jg.is_deleted = 0
- AND jgm.user_id = #{userId} )
- </if>
+ <where>
+ <if test="neiCode != null and neiCode != ''">
+ and jda.nei_code = #{neiCode}
+ </if>
+ <if test="userId != null">
+ AND jhr.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ AND jgm.user_id = #{userId} )
+ </if>
+ and jhr.is_deleted = 0
+ and jhr.audit_status = 0
+ </where>
+
</select>
--
Gitblit v1.9.3