From 1a47d5fe54230e312aa8486aad7fb30ada1f7b2b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 06 Dec 2023 09:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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 65bc733..a52d157 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -283,12 +283,12 @@
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
LEFT JOIN jczz_house_rental jhr on jhr.house_code=jgr.house_code
WHERE
jg.is_deleted = 0
- and jh.confirm_flag = 0
- AND jg.user_id = #{userId}
-
+ and jhr.audit_status = 0
+ AND jgm.user_id = #{userId}
</select>
--
Gitblit v1.9.3