From 1dc040a15692730e3e2a32992e48d3950fb61444 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 十一月 2025 18:03:38 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/SysUserMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
index 515c620..478b758 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
@@ -9,6 +9,7 @@
<id property="orgid" column="orgid"/>
<id property="hisUserId" column="his_user_id"/>
<result property="deptId" column="dept_id"/>
+ <result property="userCode" column="user_code"/>
<result property="hospInfo" column="hosp_info"/>
<result property="deptInfo" column="dept_info"/>
<result property="userName" column="user_name"/>
@@ -34,6 +35,7 @@
<result property="userType" column="user_type"/>
<result property="searchscope" column="searchscope"/>
<result property="guid" column="guid"/>
+ <result property="campusid" column="campusid"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept"
resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -47,6 +49,7 @@
<result property="orderNum" column="order_num"/>
<result property="leader" column="leader"/>
<result property="status" column="dept_status"/>
+ <result property="campusid" column="campusid"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
@@ -61,9 +64,11 @@
<sql id="selectUserVo">
select u.user_id,
u.dept_id,
+ u.user_code,
u.id_card,
u.hosp_info,
u.dept_info,
+ u.campusid,
u.searchscope,
u.user_name,
u.user_type,
@@ -106,7 +111,9 @@
</sql>
<select id="selectUserList" 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,
+ select u.user_code,u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id,
+ u.user_type,
+ u.campusid,
u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
@@ -122,7 +129,10 @@
AND u.user_id = #{userId}
</if>
<if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
+ AND u.user_name = #{userName}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND u.orgid = #{orgid}
</if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
@@ -136,8 +146,11 @@
<if test="title != null and title != ''">
AND u.title = #{title}
</if>
- <if test="job_phone != null and job_phone != ''">
- AND u.job_phone = #{job_phone}
+ <if test="jobPhone != null and jobPhone != ''">
+ AND u.job_phone = #{jobPhone}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ AND u.campusid = #{campusid}
</if>
<if test="birthday != null and birthday != ''">
AND u.birthday = #{birthday}
@@ -165,12 +178,13 @@
<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
resultMap="SysUserResult">
select distinct u.user_id,u.his_user_id,u.title,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_name,
- u.user_type,
+ u.user_type,u.user_code,
u.nick_name,
u.email,
u.birthday,
u.job_phone,
u.orgid,
+ u.campusid,
u.phonenumber, u.status,u.id_card,
u.create_time
from sys_user u
@@ -190,6 +204,9 @@
<if test="hisUserId != null and hisUserId != ''">
AND u.his_user_id = #{hisUserId}
</if>
+ <if test="campusid != null and campusid != ''">
+ AND u.campusid = #{campusid}
+ </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
@@ -198,7 +215,9 @@
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,
+ u.user_code,
u.email,
+ u.campusid,
u.his_user_id,
u.title,
u.orgid,
@@ -280,6 +299,10 @@
<if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
<if test="guid != null and guid != ''">guid,</if>
<if test="orgid != null and orgid != ''">orgid,</if>
+ <if test="deptCode != null and deptCode != ''">dept_code,</if>
+ <if test="deptName != null and deptName != ''">dept_name,</if>
+ <if test="userCode != null and userCode != ''">user_code,</if>
+ <if test="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -305,15 +328,20 @@
<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
<if test="guid != null and guid != ''">#{guid},</if>
<if test="orgid != null and orgid != ''">#{orgid},</if>
+ <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
+ <if test="deptName != null and deptName != ''">#{deptName},</if>
+ <if test="userCode != null and userCode != ''">#{userCode},</if>
+ <if test="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
</insert>
- <insert id="batchUser">
+ <insert id="batchUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
user_id, dept_id, user_name, nick_name, email, avatar, phonenumber, sex, password, status, create_by, remark,
- user_type, dept_info, hosp_info, searchscope, id_card, title, job_phone, birthday, his_user_id, guid, orgid,
+ user_type, dept_info, hosp_info, searchscope, id_card, title, job_phone, birthday, his_user_id, guid,
+ orgid,user_code,campusid,
create_time
) values
<foreach collection="list" item="item" separator=",">
@@ -341,6 +369,8 @@
#{item.hisUserId},
#{item.guid},
#{item.orgid},
+ #{item.userCode},
+ #{item.campusid},
now()
)
</foreach>
@@ -370,6 +400,8 @@
<if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
<if test="birthday != null ">birthday=#{birthday},</if>
<if test="orgid != null ">orgid=#{orgid},</if>
+ <if test="userCode != null ">user_code=#{userCode},</if>
+ <if test="campusid != null ">campusid=#{campusid},</if>
<if test="title != null and title != ''">
title = #{title},
</if>
@@ -396,12 +428,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