From b59994e2c9974618d6c579cf3893a504c94fc2f7 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 28 十一月 2023 08:38:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index 7bfe7cb..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>
@@ -987,7 +990,7 @@
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