From 3707ace2281019ed0421b59674fc549020239903 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 29 十一月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index bf64396..d8e6366 100644
--- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
+++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -109,9 +109,12 @@
<if test="userId !=null and userId !=''">
sdu.user_id=#{userId} AND
</if>
+ <if test="userType !=null and userType !=''">
+ spu.user_type=#{userType} AND
+ </if>
</trim>
</where>
-
+ order by spu.create_time desc
</select>
<select id="queryForPullDownDorm" resultType="com.thhy.staff.modules.biz.platuser.entity.PlatUserPullDown">
@@ -981,13 +984,13 @@
</select>
<select id="queryAdminByArea" resultType="com.thhy.staff.modules.biz.platuser.entity.NamePhoneDepart">
- select rwu.user_id,spu.real_name as realName,spu.phone,spu.photo,sd.departName
+ select rwu.user_id,spu.real_name as realName,spu.phone,spu.photo,sd.depart_name as departName
from t_region_warranty_user rwu
left join sys_plat_user spu on spu.user_id = rwu.user_id
left join sys_depart_user sdu on sdu.user_id = spu.user_id
left join sys_depart sd on sd.depart_id = sdu.depart_id
where rwu.region_warranty_id = #{regionWarrantyId}
- order by user_type
+ order by rwu.user_type
</select>
<select id="faceArea" resultType="string">
--
Gitblit v1.9.3