From f89e03e3c1f2d621e62b7521fa0112ea63ed10f5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 15:59:16 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/SysUserMapper.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
index 1085485..478b758 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
@@ -35,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"/>
@@ -48,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">
@@ -66,6 +68,7 @@
                u.id_card,
                u.hosp_info,
                u.dept_info,
+               u.campusid,
                u.searchscope,
                u.user_name,
                u.user_type,
@@ -110,6 +113,7 @@
     <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,
@@ -127,7 +131,7 @@
         <if test="userName != null and userName != ''">
             AND u.user_name = #{userName}
         </if>
-          <if test="orgid != null and orgid != ''">
+        <if test="orgid != null and orgid != ''">
             AND u.orgid = #{orgid}
         </if>
         <if test="nickName != null and nickName != ''">
@@ -144,6 +148,9 @@
         </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}
@@ -177,6 +184,7 @@
         u.birthday,
         u.job_phone,
         u.orgid,
+        u.campusid,
         u.phonenumber, u.status,u.id_card,
         u.create_time
         from sys_user u
@@ -196,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>
@@ -206,6 +217,7 @@
         u.nick_name,
         u.user_code,
         u.email,
+        u.campusid,
         u.his_user_id,
         u.title,
         u.orgid,
@@ -290,6 +302,7 @@
         <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>
@@ -318,6 +331,7 @@
         <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>
@@ -327,7 +341,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,
+        orgid,user_code,campusid,
         create_time
         ) values
         <foreach collection="list" item="item" separator=",">
@@ -356,6 +370,7 @@
             #{item.guid},
             #{item.orgid},
             #{item.userCode},
+            #{item.campusid},
             now()
             )
         </foreach>
@@ -386,6 +401,7 @@
             <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>

--
Gitblit v1.9.3