From 5389773b2d1ae86daec68b00f67c3682dc907e01 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十一月 2024 14:35:48 +0800
Subject: [PATCH] 代码提交(长期任务电话完成)
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 89fc648..894d9f9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -21,6 +21,7 @@
<result property="loginIp" column="login_ip"/>
<result property="loginDate" column="login_date"/>
<result property="createBy" column="create_by"/>
+ <result property="idCard" column="id_card"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
@@ -54,6 +55,7 @@
<sql id="selectUserVo">
select u.user_id,
u.dept_id,
+ u.id_card,
u.hosp_info,
u.dept_info,
u.searchscope,
@@ -92,7 +94,8 @@
</sql>
<select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
- select u.user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type, u.nick_name, u.user_name, u.email,
+ select u.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.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
@@ -110,6 +113,9 @@
</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="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -130,9 +136,10 @@
<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
resultMap="SysUserResult">
- select distinct u.user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_name, u.user_type, u.nick_name,
+ select distinct u.user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_name, u.user_type,
+ u.nick_name,
u.email,
- u.phonenumber, u.status,
+ u.phonenumber, u.status,u.id_card,
u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -151,9 +158,10 @@
<select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.hosp_info, u.dept_info,u.searchscope, u.user_name, u.user_type, u.nick_name,
+ select distinct u.user_id, u.dept_id, u.hosp_info, u.dept_info,u.searchscope, u.user_name, u.user_type,
+ u.nick_name,
u.email,
- u.phonenumber, u.status,
+ u.phonenumber, u.status,u.id_card,
u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -222,6 +230,7 @@
<if test="deptInfo != null and deptInfo != ''">dept_info,</if>
<if test="hospInfo != null and hospInfo != ''">hosp_info,</if>
<if test="searchscope != null and searchscope != ''">searchscope,</if>
+ <if test="idCard != null and idCard != ''">id_card,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -240,6 +249,7 @@
<if test="deptInfo != null and deptInfo != ''">#{deptInfo},</if>
<if test="hospInfo != null and hospInfo != ''">#{hospInfo},</if>
<if test="searchscope != null and searchscope != ''">#{searchscope},</if>
+ <if test="idCard != null and idCard != ''">#{idCard},</if>
sysdate()
)
</insert>
@@ -264,6 +274,7 @@
<if test="searchscope != null">searchscope = #{searchscope},</if>
<if test="deptInfo != null and deptInfo != ''">dept_info=#{deptInfo},</if>
<if test="hospInfo != null and hospInfo != ''">hosp_info=#{hospInfo},</if>
+ <if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.9.3