From f5412313edae1ffae3d5471e5eca8dde4695f0d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 07 十一月 2025 17:46:35 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index c13724f..ed674cf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -26,11 +26,13 @@
<result property="deptType" column="dept_type"/>
<result property="guid" column="guid"/>
<result property="orgid" column="orgid"/>
+ <result property="campusid" column="campusid"/>
</resultMap>
<sql id="selectDeptVo">
select d.dept_id,
d.dept_code,
+ d.campusid,
d.parent_id,
d.ancestors,
d.dept_name,
@@ -71,15 +73,21 @@
<if test="deptType != null and deptType != ''">
AND dept_type = #{deptType}
</if>
+ <if test="campusid != null and campusid != ''">
+ AND campusid = #{campusid}
+ </if>
<if test="hisDeptId != null and hisDeptId != ''">
AND his_dept_id = #{hisDeptId}
</if>
<if test="hisParentId != null and hisParentId != ''">
AND his_parent_id = #{hisParentId}
</if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
- order by d.parent_id, d.order_num
+ order by d.dept_type asc, d.parent_id, d.order_num
</select>
<select id="selectDeptListByRoleId" resultType="Long">
@@ -105,9 +113,10 @@
d.leader,
d.phone,
d.email,
+ d.campusid,
d.status,
d.his_dept_id,
- d.his_parent_id
+ d.his_parent_id,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}
@@ -116,6 +125,7 @@
<select id="selectDeptByCode" parameterType="string" resultMap="SysDeptResult">
select d.dept_id,
d.parent_id,
+ d.campusid,
d.dept_code,
d.dept_type,
d.ancestors,
@@ -182,6 +192,7 @@
<if test="hisDeptId != null and hisDeptId != ''">his_dept_id,</if>
<if test="hisParentId != null and hisParentId != ''">his_parent_id,</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>
@@ -199,6 +210,7 @@
<if test="hisDeptId != null and hisDeptId != ''">#{hisDeptId},</if>
<if test="hisParentId != null and hisParentId != ''">#{hisParentId},</if>
<if test="orgid != null and orgid != ''">#{orgid},</if>
+ <if test="campusid != null and campusid != ''">#{campusid},</if>
sysdate()
)
</insert>
@@ -220,6 +232,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="orgid != null and orgid != ''">orgid = #{orgid},</if>
+ <if test="campusid != null and campusid != ''">campusid = #{campusid},</if>
update_time = sysdate()
</set>
where dept_id = #{deptId}
@@ -247,7 +260,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