From 4c8992891ac92ace938ad81f38d7b9fb6e5cd78c Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:52:13 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7471f7f..cd5db8f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -137,23 +137,40 @@
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
     <select id="getList" resultType="com.ruoyi.system.api.domain.SysUser">
-			select su.user_id userId,su.nick_name nickName,su.phonenumber,su.status,sr.role_name
-			roleName,sr.role_id roleId,case su.user_type when '01' then 2
-			else 1 end as isAuctioneer
-			from
-			sys_user su left join sys_user_role sur on su.user_id = sur.user_id left join sys_role sr on
-			sr.role_id
-			= sur.role_id where 1=1
+		SELECT
+		su.user_id userId,
+		su.nick_name nickName,
+		su.phonenumber,
+		su. STATUS,
+		sr.role_name roleName,
+		dp.dept_name deptName,
+		su.dept_id deptId,
+		sr.role_id roleId,
+		CASE su.user_type
+		WHEN '01' THEN
+		2
+		ELSE
+		1
+		END AS isAuctioneer
+		FROM
+		sys_user su
+		LEFT JOIN sys_user_role sur ON su.user_id = sur.user_id
+		LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
+		LEFT JOIN sys_dept dp ON dp.dept_id = su.dept_id
+			where 1=1
 			<if test="nickName !=null and nickName !=''">
 				and su.nick_name like concat("%", #{nickName},"%")
 			</if>
 		<if test="phonenumber !=null and phonenumber !=''">
 			and su.phonenumber like concat("%", #{phonenumber},"%")
 		</if>
+		<if test="deptId !=null and deptId !=''">
+			and su.dept_id = #{deptId}
+		</if>
 			<if test="status !=null and status !=''">
 				and su.status = #{status}
 			</if>
-			and su.del_flag = '0' and su.user_type in('00','01')
+			and su.del_flag = '0' and su.user_type in('00')
 			order by su.create_time desc
 	</select>
 	<select id="getAllList" resultType="com.ruoyi.system.api.domain.SysUser">

--
Gitblit v1.7.1