From af73b41c2b027d8d74ce417e2f10008337577128 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 十月 2025 14:07:06 +0800
Subject: [PATCH] 新增服务补偿，用户查询BUG修改

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index d975b62..20ff6a8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -119,9 +119,9 @@
         u.birthday,
         u.job_phone,
         u.phonenumber, u.sex, u.status,
-        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
+        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name from sys_user
         u
-        left join sys_dept d on u.dept_id = d.dept_id
+        left join sys_user_dept d on u.user_id = d.user_id
         where u.del_flag = '0'
         <if test="userId != null">
             AND u.user_id = #{userId}
@@ -174,6 +174,69 @@
         </if>
         <!-- 鏁版嵁鑼冨洿杩囨护 -->
         ${params.dataScope}
+    </select>
+    <select id="getUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
+        select u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type,
+        u.nick_name, u.user_name,
+        u.email,u.id_card,
+        u.avatar,
+        u.dept_name,
+        u.dept_code,
+        u.birthday,
+        u.job_phone,
+        u.phonenumber, u.sex, u.status,
+        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark from sys_user u
+        where u.del_flag = '0'
+        <if test="userId != null">
+            AND u.user_id = #{userId}
+        </if>
+        <if test="orgid != null and orgid != ''">
+            AND u.orgid = #{orgid}
+        </if>
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="nickName != null and nickName != ''">
+            AND u.nick_name like concat('%', #{nickName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND u.status = #{status}
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND u.id_card = #{idCard}
+        </if>
+        <if test="title != null and title != ''">
+            AND u.title = #{title}
+        </if>
+        <if test="jobPhone != null and jobPhone != ''">
+            AND u.job_phone = #{jobPhone}
+        </if>
+        <if test="birthday != null and birthday != ''">
+            AND u.birthday = #{birthday}
+        </if>
+        <if test="deptName != null and deptName != ''">
+            AND u.dept_name = #{deptName}
+        </if>
+        <if test="deptCode != null and deptCode != ''">
+            AND u.dept_code = #{deptCode}
+        </if>
+        <if test="hisUserId != null and hisUserId != ''">
+            AND u.his_user_id = #{hisUserId}
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <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="deptId != null and deptId != 0">
+            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
+            ancestors) ))
+        </if>
+        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
     </select>
 
     <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
@@ -401,12 +464,12 @@
 
     <delete id="deleteUserById" parameterType="Long">
         update sys_user
-        set del_flag = '2'
+        set del_flag = '1'
         where user_id = #{userId}
     </delete>
 
     <delete id="deleteUserByIds" parameterType="Long">
-        update sys_user set del_flag = '2' where user_id in
+        update sys_user set del_flag = '1' where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
         </foreach>

--
Gitblit v1.9.3