From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填,有时候可能不含税

---
 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..bcf7b01 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 = 100)
             <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