From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 604cc44..efbea42 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -64,9 +64,8 @@
if(jhr.termination_time is null,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1),2) as status
FROM jczz_house_rental jhr
JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
- JOIN jczz_house jh ON jh.house_code = jhr.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
+ JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
LEFT JOIN (
SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
FROM jczz_household jht RIGHT JOIN (
@@ -126,10 +125,21 @@
<if test="vo.startTime != null and vo.startTime != '' and vo.endTime != null and vo.endTime != '' ">
AND jhr.create_time BETWEEN #{vo.startTime} and #{vo.endTime}
</if>
- <if test="vo.regionCode!=null and vo.regionCode!=''">
- and jg.community_code like concat('%',#{vo.regionCode},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
<include refid="filterHouseGrid"/>
+ order by jhr.create_time desc,jhr.id desc
</select>
<!--查询房屋出租情况-->
--
Gitblit v1.9.3