From 211aafe0cb765b1deb5f2ef54949d64e9b0de8c3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 03 十二月 2025 17:56:36 +0800
Subject: [PATCH] yys1.海川开心-修改首页库存与采购数据不显示问题    2.海川开心-优化选择审批人时增加模糊查询    3.海川开心-协同办公部门改为可手动输入    4.海川开心-修改回款流水导出没数据问题

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

diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 898d3d1..7caa57e 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,12 +13,13 @@
             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>

--
Gitblit v1.9.3