From 878b7d3bcddaf5bfff49d23796f3473c022853f5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 09:06:56 +0800
Subject: [PATCH] 时间倒叙，不然新打卡的，都要一页一页往下翻
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 0396abc..8f0918e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -85,6 +85,7 @@
<collection property="householdLabelList" javaType="java.util.List"
ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
<id property="id" column="cid"/>
+ <id property="houseCode" column="houseCodes"/>
<result property="remark" column="cremark"/>
</collection>
</resultMap>
@@ -223,7 +224,15 @@
<select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
select
jh.*,
- jhl.id as cid,jhl.*,jhl.remark as cremark
+ jhl.id as cid,
+ jhl.house_code houseCodes,
+ jhl.label_id,
+ jhl.label_name,
+ jhl.color,
+ jhl.user_id,
+ jhl.lable_type,
+ jhl.household_id,
+ jhl.remark as cremark
from jczz_household jh
left join jczz_user_house_label jhl on jh.id = jhl.household_id
where 1=1 and jh.is_deleted = 0
@@ -234,7 +243,15 @@
<select id="getHouseholdListById" resultMap="householdAndLabelMap" >
select
jh.*,
- jhl.id as cid,jhl.*,jhl.remark as cremark
+ jhl.id as cid,
+ jhl.house_code houseCodes,
+ jhl.label_id,
+ jhl.label_name,
+ jhl.color,
+ jhl.user_id,
+ jhl.lable_type,
+ jhl.household_id,
+ jhl.remark as cremark
from jczz_household jh
left join jczz_user_house_label jhl on jh.id = jhl.household_id
where 1=1 and is_deleted = 0
--
Gitblit v1.9.3