From 02ee149247ca123ff4df76d439fa93d7ae764f1f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 21 Jun 2024 16:54:27 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 90e27fc..842cf65 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -175,6 +175,8 @@
jh.marital_status,
jh.card_number,
jh.other_contact,
+ jh.create_time,
+ jh.update_time,
IF
( jda.id IS NOT NULL, jda.address_name, jh.current_address ) AS current_address,
jh.disability_cert,
@@ -347,7 +349,7 @@
and jhs.district_code = #{household.aoiCode}
</if>
and jh.is_deleted = 0
- order by jh.create_time desc
+ order by jh.id desc
</where>
@@ -524,6 +526,8 @@
jh.confirm_flag,
jh.housing_rental_id,
jh.volunteer_org,
+ jh.create_time,
+ jh.update_time,
if(jda.id is not null, substring(jda.town_street_code, 1, 9), jh.home_adcode) as home_adcode,
br1.name as residentAdName,
br1.province_code as residentProvinceAdCode,
@@ -1050,6 +1054,9 @@
<if test="household.confirmFlag != null ">
and jh.confirm_flag = #{household.confirmFlag}
</if>
+ <if test="household.relationship != null ">
+ and jh.relationship = #{household.relationship}
+ </if>
<if test="household.townStreetName!=null and household.townStreetName!=''">
and jda.town_street_name like concat('%',#{household.townStreetName},'%')
</if>
--
Gitblit v1.9.3