From 7b4211d813e06b810c99bed7552d732dd31b4041 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 三月 2026 17:56:36 +0800
Subject: [PATCH] yys 商机管理优化
---
src/main/resources/mapper/system/SysUserMapper.xml | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 52ec0a3..1b5cc71 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -56,19 +56,38 @@
</sql>
<select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
+ select
+ u.user_id,
+ u.nick_name,
+ u.user_name,
+ u.email,
+ u.avatar,
+ u.phonenumber,
+ u.sex,
+ u.status,
+ u.del_flag,
+ u.login_ip,
+ u.login_date,
+ u.create_by,
+ u.create_time,
+ u.remark,
+ T2.dept_names,
+ GROUP_CONCAT(DISTINCT p.post_name SEPARATOR ', ') AS post_names
+ from sys_user u
left join
- ( SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
- FROM
- sys_user_dept T1
- LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
+ ( SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
+ FROM
+ sys_user_dept T1
+ LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
<where>
<if test="tenantId != null and tenantId != 0">
T1.dept_id = #{tenantId}
</if>
</where>
- GROUP BY T1.user_id
+ GROUP BY T1.user_id
) T2 on T2.user_id = u.user_id
+ LEFT JOIN sys_user_post up ON u.user_id = up.user_id
+ LEFT JOIN sys_post p ON up.post_id = p.post_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
@@ -91,11 +110,22 @@
<if test="params.deptId != null">
AND u.user_id IN
(
- SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
+ SELECT user_id FROM sys_user_dept WHERE dept_id = #{params.deptId}
+ )
+ </if>
+ <!-- 鏂板锛氭牴鎹矖浣嶇紪鐮佺瓫閫夌敤鎴� -->
+ <if test="postCode != null and postCode != ''">
+ AND u.user_id IN
+ (
+ SELECT DISTINCT up.user_id
+ FROM sys_user_post up
+ LEFT JOIN sys_post p ON up.post_id = p.post_id
+ WHERE p.post_code = #{postCode}
)
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
+ GROUP BY u.user_id
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
@@ -158,6 +188,28 @@
#{item}
</foreach>
</select>
+ <select id="selectList" resultType="com.ruoyi.project.system.domain.SysUser">
+ SELECT user_id, nick_name FROM sys_user
+ <where>
+ <if test="list != null and list.size() > 0">
+ user_id IN
+ <foreach item="id" collection="list" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="list == null or list.size() == 0">
+ 1=0 <!-- 绌哄垪琛ㄦ椂杩斿洖绌虹粨鏋� -->
+ </if>
+ </where>
+ </select>
+ <select id="selectUsersByIds" resultType="com.ruoyi.project.system.domain.SysUser">
+ SELECT user_id, nick_name
+ FROM sys_user
+ WHERE user_id IN
+ <foreach collection="userIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
<insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
@@ -207,6 +259,7 @@
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="tenantId != null">tenant_id = #{tenantId},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.9.3