From bf84fec7d8dd5e7fbcc93030b8d83da7ec0ece91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 15:39:36 +0800
Subject: [PATCH] yys

---
 src/main/resources/mapper/system/SysUserDeptMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 898d3d1..8097988 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
     
-    <select id="selectUserDeptList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
+    <select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
         SELECT
             T1.user_id,
             T1.dept_id,
@@ -13,14 +13,18 @@
             sys_user_dept T1
         LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
         <where>
+            T1.dept_id IN (select dept_id from sys_dept where parent_id != 0)
             <if test="userDeptVo.userId != null">
-                T1.user_id = #{userDeptVo.userId}
+                AND T1.user_id = #{userDeptVo.userId}
             </if>
             <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
-                T1.user_id IN (
-                SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
+                AND T1.user_id IN (
+                SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                 )
             </if>
         </where>
     </select>
+    <select id="selectUserIdByDeptId" resultType="java.lang.Long">
+        SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3