From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人,维护时间默认当前 2.销售报价审核非必填,产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间,修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了,增加生产订单当前工序 3.库存导入模板规格改成图纸编号,产品名称可以为空,加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量(只统计二级)

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

diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index d0a03fb..5a87de1 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -88,7 +88,7 @@
 		<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
 			AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
-		<if test="params.deptId != null">
+		<if test="deptId != null">
 			AND u.user_id IN
 			(
 			SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
@@ -297,5 +297,16 @@
 			)
 		</if>
 	</select>
+    <select id="selectUserListByIds" resultType="com.ruoyi.project.system.domain.SysUser">
+		SELECT user_id, user_name, nick_name, user_type, email, phonenumber, sex, avatar,
+		password, status, del_flag, login_ip, login_date, create_by, create_time,
+		update_by, update_time, remark, tenant_id
+		FROM sys_user
+		WHERE user_id IN
+		<foreach collection="userIds" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
+		AND del_flag = '0' AND status = '0'
+	</select>
 
 </mapper>

--
Gitblit v1.9.3