From e444243ca81f28c69a5c0a79ec77689ce6f6ee52 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 二月 2026 15:03:12 +0800
Subject: [PATCH] 【丽水】新增科室用户信息接口输入
---
smartor/src/main/resources/mapper/smartor/SysUserMapper.xml | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
index 478b758..428a18a 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
@@ -6,7 +6,6 @@
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
- <id property="orgid" column="orgid"/>
<id property="hisUserId" column="his_user_id"/>
<result property="deptId" column="dept_id"/>
<result property="userCode" column="user_code"/>
@@ -35,6 +34,7 @@
<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"/>
@@ -49,7 +49,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">
@@ -68,7 +67,6 @@
u.id_card,
u.hosp_info,
u.dept_info,
- u.campusid,
u.searchscope,
u.user_name,
u.user_type,
@@ -91,6 +89,7 @@
u.remark,
u.guid,
u.orgid,
+ u.campusid,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -105,6 +104,7 @@
r.data_scope,
r.status as role_status
from sys_user u
+ left join sys_user_org o on o.user_id = u.user_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
@@ -113,16 +113,16 @@
<select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
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,
u.birthday,
- u.orgid,
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
+ u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ u.orgid, u.campusid,
+ d.dept_name, d.leader
+ from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
@@ -130,9 +130,6 @@
</if>
<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="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
@@ -148,9 +145,6 @@
</if>
<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}
@@ -183,8 +177,6 @@
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
@@ -204,9 +196,6 @@
<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>
@@ -217,10 +206,8 @@
u.nick_name,
u.user_code,
u.email,
- u.campusid,
u.his_user_id,
u.title,
- u.orgid,
u.job_phone,
u.birthday,
u.phonenumber, u.status,u.id_card,
@@ -298,10 +285,10 @@
<if test="birthday != null ">birthday,</if>
<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="orgid != null and orgid != ''">orgid,</if>
<if test="campusid != null and campusid != ''">campusid,</if>
create_time
)values(
@@ -327,10 +314,10 @@
<if test="birthday != null">#{birthday},</if>
<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="orgid != null and orgid != ''">#{orgid},</if>
<if test="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
@@ -341,7 +328,7 @@
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_code,campusid,
+ user_code, orgid, campusid,
create_time
) values
<foreach collection="list" item="item" separator=",">
@@ -368,8 +355,8 @@
#{item.birthday},
#{item.hisUserId},
#{item.guid},
- #{item.orgid},
#{item.userCode},
+ #{item.orgid},
#{item.campusid},
now()
)
@@ -399,15 +386,15 @@
<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="userCode != null ">user_code=#{userCode},</if>
- <if test="campusid != null ">campusid=#{campusid},</if>
<if test="title != null and title != ''">
title = #{title},
</if>
<if test="hisUserId != null and hisUserId != ''">
his_user_id = #{hisUserId},
</if>
+ <if test="orgid != null and orgid != ''">orgid = #{orgid},</if>
+ <if test="campusid != null and campusid != ''">campusid = #{campusid},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.9.3