From f8ccc5ab312ab7c5d6c7eb7fac4e37924f513869 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 03 十一月 2026 19:25:29 +0800
Subject: [PATCH] fix: 完善质量检验接口与质检员分配

---
 src/main/resources/mapper/system/SysUserMapper.xml |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 5ac9a4d..6ffc9de 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -98,6 +98,25 @@
 		${params.dataScope}
 	</select>
 
+	<select id="selectActiveUsers" resultMap="SysUserResult">
+		SELECT u.user_id,
+		       u.user_name,
+		       COALESCE(NULLIF(u.nick_name, ''), u.user_name) AS nick_name,
+		       u.status,
+		       u.tenant_id,
+		       GROUP_CONCAT(DISTINCT d.dept_name ORDER BY d.dept_name SEPARATOR ', ') AS dept_names
+		FROM sys_user u
+		LEFT JOIN sys_user_dept ud ON ud.user_id = u.user_id
+		LEFT JOIN sys_dept d ON d.dept_id = ud.dept_id
+		WHERE u.status = '0'
+		  AND u.del_flag = '0'
+		<if test="tenantId != null">
+		  AND u.tenant_id = #{tenantId}
+		</if>
+		GROUP BY u.user_id, u.user_name, u.nick_name, u.status, u.tenant_id
+		ORDER BY nick_name, u.user_name
+	</select>
+
 	<select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id,  u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u

--
Gitblit v1.9.3