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/SysDeptMapper.xml |   49 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
index 089aa5e..d17ca0c 100644
--- a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
@@ -27,6 +27,7 @@
         <result property="guid" column="guid"/>
         <result property="orgid" column="orgid"/>
         <result property="type" column="type"/>
+        <result property="campusid" column="campusid"/>
     </resultMap>
 
     <sql id="selectDeptVo">
@@ -34,6 +35,7 @@
                d.dept_code,
                d.type,
                d.orgid,
+               d.campusid,
                d.parent_id,
                d.ancestors,
                d.dept_name,
@@ -82,6 +84,9 @@
         <if test="hisParentId != null and hisParentId != ''">
             AND his_parent_id = #{hisParentId}
         </if>
+        <if test="campusid != null and campusid != ''">
+            AND campusid = #{campusid}
+        </if>
         order by d.parent_id, d.order_num
     </select>
 
@@ -100,6 +105,7 @@
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
         select d.dept_id,
                d.parent_id,
+               d.campusid,
                d.dept_code,
                d.type,
                d.dept_type,
@@ -120,23 +126,29 @@
 
     <select id="selectDeptByCode" parameterType="string" resultMap="SysDeptResult">
         select d.dept_id,
-               d.parent_id,
-               d.type,
-               d.dept_code,
-               d.dept_type,
-               d.ancestors,
-               d.dept_name,
-               d.order_num,
-               d.leader,
-               d.phone,
-               d.email,
-               d.orgid,
-               d.his_dept_id,
-               d.his_parent_id
-            d.status
+        d.parent_id,
+        d.type,
+        d.campusid,
+        d.dept_code,
+        d.dept_type,
+        d.ancestors,
+        d.dept_name,
+        d.order_num,
+        d.leader,
+        d.phone,
+        d.email,
+        d.orgid,
+        d.his_dept_id,
+        d.his_parent_id,
+        d.status
         from sys_dept d
         where del_flag = 0
-          and d.dept_code = #{deptCode}
+        <if test="deptCode != null and deptCode != ''">
+            AND dept_code = #{deptCode}
+        </if>
+        <if test="orgid != null and orgid != ''">
+            AND orgid = #{orgid}
+        </if>
     </select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
@@ -192,6 +204,7 @@
         type,
         guid,
         orgid,
+        campusid,
         create_time
         ) values
         <foreach collection="list" item="item" separator=",">
@@ -213,6 +226,7 @@
             #{item.type},
             #{item.guid},
             #{item.orgid},
+            #{item.campusid},
             now()
             )
         </foreach>
@@ -238,6 +252,7 @@
         <if test="type != null and type != ''">type,</if>
         <if test="guid != null and guid != ''">guid,</if>
         <if test="orgid != null and orgid != ''">orgid,</if>
+        <if test="campusid != null and campusid != ''">campusid,</if>
         create_time
         )values(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -257,6 +272,7 @@
         <if test="type != null and type != ''">#{type},</if>
         <if test="guid != null and guid != ''">#{guid},</if>
         <if test="orgid != null and orgid != ''">#{orgid},</if>
+        <if test="campusid != null and campusid != ''">#{campusid},</if>
         sysdate()
         )
     </insert>
@@ -279,6 +295,7 @@
             <if test="hisParentId != null and hisParentId != ''">his_parent_id = #{hisParentId},</if>
             <if test="hisDeptId != null and hisDeptId != ''">his_dept_id = #{hisDeptId},</if>
             <if test="type != null and type != ''">type = #{type},</if>
+            <if test="campusid != null and campusid != ''">campusid = #{campusid},</if>
             update_time = sysdate()
         </set>
         where dept_id = #{deptId}
@@ -306,7 +323,7 @@
 
     <delete id="deleteDeptById" parameterType="Long">
         update sys_dept
-        set del_flag = '2'
+        set del_flag = '1'
         where dept_id = #{deptId}
     </delete>
 

--
Gitblit v1.9.3