From f802a6876c8a86ffae9547ed5fea15df15c303f8 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期一, 27 十一月 2023 22:31:58 +0800
Subject: [PATCH] 20231127_qiuyh_积分超市

---
 hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 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..d932fb5 100644
--- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
+++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -109,6 +109,9 @@
                 <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>
 
@@ -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