From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 36 +++---------------------------------
1 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 3c24a94..b61d615 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -35,8 +35,6 @@
<result property="userType" column="user_type"/>
<result property="searchscope" column="searchscope"/>
<result property="guid" column="guid"/>
- <result property="orgid" column="orgid"/>
- <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"/>
@@ -50,7 +48,6 @@
<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">
@@ -67,7 +64,6 @@
u.dept_id,
u.id_card,
u.hosp_info,
- u.campusid,
u.dept_info,
u.searchscope,
u.user_name,
@@ -92,7 +88,6 @@
u.create_time,
u.remark,
u.guid,
- u.orgid,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -117,7 +112,6 @@
u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
- u.campusid,
u.dept_name,
u.dept_code,
u.birthday,
@@ -130,9 +124,6 @@
<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>
@@ -141,9 +132,6 @@
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
- </if>
- <if test="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
</if>
<if test="idCard != null and idCard != ''">
AND u.id_card = #{idCard}
@@ -184,7 +172,7 @@
</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.campusid,
+ u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
u.dept_name,
@@ -196,12 +184,6 @@
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="campusid != null and campusid != ''">
- AND u.campusid = #{campusid}
</if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -257,7 +239,6 @@
u.email,
u.dept_code,
u.dept_name,
- u.campusid,
u.birthday,
u.job_phone,
u.phonenumber, u.status,u.id_card,
@@ -287,7 +268,6 @@
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.campusid,
u.email,
u.his_user_id,
u.title,
@@ -321,18 +301,14 @@
<select id="selectUserByUserNameByCondition" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
- <where>
- u.del_flag = '0'
+ where 1=1
+ AND u.del_flag = '0'
<if test="userName != null and userName != ''">
AND u.user_name = #{userName}
- </if>
- <if test="orgid != null and orgid != ''">
- AND u.orgid = #{orgid}
</if>
<if test="deptId != null and deptId != ''">
AND u.dept_id = #{deptId}
</if>
- </where>
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -386,10 +362,8 @@
<if test="jobPhone != null and jobPhone != ''">job_phone,</if>
<if test="birthday != null ">birthday,</if>
<if test="hisUserId != null and hisUserId != ''">his_user_id,</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="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -413,10 +387,8 @@
<if test="jobPhone != null and jobPhone != ''">#{jobPhone},</if>
<if test="birthday != null and birthday != ''">#{birthday},</if>
<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</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="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
</insert>
@@ -444,7 +416,6 @@
<if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
<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="title != null and title != ''">
title = #{title},
</if>
@@ -453,7 +424,6 @@
</if>
<if test="deptCode != null and deptCode != ''">dept_code=#{deptCode},</if>
<if test="deptName != null and deptName != ''">dept_name=#{deptName},</if>
- <if test="campusid != null and campusid != ''">campusid=#{campusid},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.9.3