From 0c5296feb5e2a9300107b247a3e4a0d713af4667 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 09:52:36 +0800
Subject: [PATCH] BOM个工艺路线以及生产订单实体类对应关联的旧产品规格id加上注释//宁夏-中盛建材使用新的产品表关联product_material_sku
---
src/main/resources/mapper/system/SysUserDeptMapper.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 0a62acb..498442d 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -3,8 +3,24 @@
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="selectUserDeptList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
+ <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,
T1.dept_id,
@@ -13,8 +29,14 @@
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 != '' ">
+ AND T1.user_id IN (
+ SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
+ )
</if>
</where>
</select>
--
Gitblit v1.9.3