From ad53e4af4e4e238453d7613530b501540df915e1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 19:12:24 +0800
Subject: [PATCH] 长期任务，BUG处理

---
 smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
index 3cc633b..0c57056 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
@@ -15,6 +15,7 @@
         <result property="deptType" column="dept_type"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="campusid" column="campusid"/>
     </resultMap>
 
     <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
@@ -25,6 +26,7 @@
         <result property="orderNum" column="order_num"/>
         <result property="leader" column="leader"/>
         <result property="status" column="dept_status"/>
+        <result property="campusid" column="campusid"/>
     </resultMap>
 
     <sql id="selectSysUserDeptVo">
@@ -32,6 +34,7 @@
                user_id,
                dept_id,
                del_flag,
+               campusid,
                orgid,
                create_time,
                update_time,
@@ -46,6 +49,7 @@
         <include refid="selectSysUserDeptVo"/>
         <where>
             del_flag=0
+            and orgid=#{orgid}
             <if test="userId != null ">
                 and user_id = #{userId}
             </if>
@@ -66,6 +70,9 @@
             </if>
             <if test="deptCode != null ">
                 and dept_code = #{deptCode}
+            </if>
+            <if test="campusid != null ">
+                and campusid = #{campusid}
             </if>
         </where>
     </select>
@@ -101,8 +108,15 @@
             </if>
             <if test="deptName != null ">
                 dept_name,
-            </if>   <if test="orgid != null ">
-            orgid,
+            </if>
+            <if test="orgid != null ">
+                orgid,
+            </if>
+            <if test="userCode != null ">
+                user_code,
+            </if>
+            <if test="campusid != null ">
+                campusid,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -127,8 +141,15 @@
             </if>
             <if test="deptName != null ">
                 #{deptName},
-            </if><if test="orgid != null ">
+            </if>
+            <if test="orgid != null ">
                 #{orgid},
+            </if>
+            <if test="userCode != null ">
+                #{userCode},
+            </if>
+            <if test="campusid != null ">
+                #{campusid},
             </if>
         </trim>
     </insert>
@@ -159,8 +180,12 @@
             </if>
             <if test="deptName != null ">
                 dept_name = #{deptName},
-            </if> <if test="orgid != null ">
-            orgid = #{orgid},
+            </if>
+            <if test="orgid != null ">
+                orgid = #{orgid},
+            </if>
+            <if test="campusid != null ">
+                campusid = #{campusid},
             </if>
         </trim>
         where id = #{id}
@@ -181,11 +206,12 @@
                d.ancestors,
                d.dept_name,
                d.order_num,
+               d.campusid,
                d.leader,
                d.orgid,
                d.status as dept_status
         from sys_dept d
-                 left join sys_user_dept ud on d.dept_id = ud.dept_id
+                 left join sys_user_dept ud on d.dept_code = ud.dept_code
         where ud.user_id = #{userId}
           and ud.del_flag = 0
           and d.del_flag = 0

--
Gitblit v1.9.3