From 79d28c3b174275e4ecdd89baa5b0d7caccda5c8d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 20 Jun 2024 17:18:01 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 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 be2c060..9bd5222 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -204,21 +204,22 @@
 
         <include refid="filterData"/>
 
-        order by jhr.create_time desc,jhr.id desc
+        order by jhr.id desc
     </select>
 
     <!--查询房屋出租情况-->
     <select id="getHouseRentalListByCode" resultMap="houseRentalTenant">
-        select
-            jhr.*,
-            if(termination_time is null,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1),2) as status,
-            jht.id as tenantId,
-            jht.*
+        select jhr.*,
+               if(termination_time is null,
+                  if(date_format(jhr.due_time, '%Y-%m-%d') >= date_format(now(), '%Y-%m-%d'), 0, 1), 2) as status,
+               jht.id                                                                                   as tenantId,
+               jht.*
         from jczz_house_rental jhr
-        left join jczz_household jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
+                 left join jczz_household jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
         where 1 = 1
-        and jhr.is_deleted = 0
-        and jhr.house_code = #{code}
+          and jhr.is_deleted = 0
+          and jhr.house_code = #{code}
+        order by jhr.id desc
     </select>
 
     <sql id="filterHouseGrid">

--
Gitblit v1.9.3