From 7c4214af1e58eb176dfac580383e07c93bfdd521 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期二, 28 十一月 2023 14:39:33 +0800
Subject: [PATCH] 20231128_qiuyh_修改导出时间格式

---
 hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index a04b597..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">
@@ -965,7 +968,7 @@
     </insert>
 
     <select id="queryGroups" resultType="hashmap">
-        select id,group_id as groupId,group_name as groupName from t_audio_groups
+        select id,group_id as groupId,group_name as groupName from t_audio_group
     </select>
 
     <select id="queryHelmetWarn" resultType="hashmap">
@@ -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