From 19eefcf5f39fd6ae3e161f978b74d92353585fc7 Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期一, 27 十一月 2023 16:30:50 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 6 +++--- 1 files changed, 3 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 a04b597..6ed1f03 100644 --- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml +++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml @@ -965,7 +965,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 +981,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