From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/system/SysUserDeptMapper.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 81c1365..498442d 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -3,7 +3,23 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
-
+ <select id="setSchemeApplicableStaffUserInfo" resultType="java.util.Map">
+ SELECT
+ T1.id as id,
+ T1.staff_no as staffNo,
+ T1.staff_name as staffName,
+ T2.dept_id as deptId,
+ T2.dept_name as deptName
+ FROM
+ staff_on_job T1
+ LEFT JOIN sys_dept T2 ON T1.sys_dept_id = T2.dept_id
+ <where>
+ T1.sys_dept_id in<foreach collection="ids" item="id" separator="," close=")" open="(">#{id}</foreach>
+ </where>
+ GROUP BY
+ T1.id
+ </select>
+
<select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
SELECT
T1.user_id,
@@ -13,13 +29,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)
+ T1.dept_id IN (select dept_id from sys_dept where parent_id != 0)
<if test="userDeptVo.userId != null">
AND T1.user_id = #{userDeptVo.userId}
</if>
<if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
AND T1.user_id IN (
- SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
+ SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
)
</if>
</where>
--
Gitblit v1.9.3