From 125a6f192ed7e611739f8648cf036360f600c41b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 29 一月 2024 17:27:44 +0800
Subject: [PATCH] 修改客户反馈的bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
index a9a56a5..97aaf44 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
@@ -17,7 +17,7 @@
hr.latitude,
hr.platform,
hr.sale_amount as saleAmount,
- IFNULL(su.`name`,au.nickname) as nickname,
+ IFNULL(au.nickname,su.`name`) as nickname,
IFNULL(au.profile_photo,su.avatar) as profilePhoto,
au.profile_photo as profilePhoto,
hr.drying_area as dryingArea,
@@ -28,7 +28,8 @@
hr.is_manage as isManage,
hr.leaseTime,
tp.name as houseTypeName,
- hr.keep_pet as keepPet
+ hr.keep_pet as keepPet,
+ hr.insert_time as insertTime
from t_house_resource hr
left join t_app_user au on (hr.app_user_id = au.id)
LEFT JOIN sys_user su ON hr.insert_user_id = su.id AND hr.is_manage = 1
@@ -241,7 +242,7 @@
<if test="null != req.dataType and req.dataType == 2">
and now() <= DATE_ADD(hr.insert_time,INTERVAL 21 day)
</if>
- order by au.user_type desc
+ order by au.user_type desc,hr.insert_time desc
<if test="null != req.sort and req.sort == 1">
,hr.insert_time desc
</if>
--
Gitblit v1.7.1