From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/resources/mapper/DepartmentMapper.xml | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml
index 598c2a5..6270696 100644
--- a/src/main/resources/mapper/DepartmentMapper.xml
+++ b/src/main/resources/mapper/DepartmentMapper.xml
@@ -27,9 +27,6 @@
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
- <if test="adminId != null">
- admin_id = #{adminId},
- </if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=VARCHAR},
</if>
@@ -148,10 +145,10 @@
<select id="getChilds" resultType="integer">
WITH RECURSIVE temp_table AS (
SELECT
- id, name, parent_id,special,level FROM t_department WHERE id in <foreach collection="deptIds" open="(" item="deptId" close=")" separator=",">#{deptId}</foreach>
+ id, name, parent_id,special,level FROM t_department WHERE id in <foreach collection="deptIds" open="(" item="deptId" close=")" separator=",">#{deptId}</foreach> AND deleted = 0
UNION ALL
SELECT
- so.id, so.name, so.parent_id, so.special, so.level FROM t_department so INNER JOIN temp_table tb ON so.parent_id = tb.id
+ so.id, so.name, so.parent_id, so.special, so.level FROM t_department so INNER JOIN temp_table tb ON so.parent_id = tb.id AND so.deleted = 0
)
SELECT
DISTINCT id
@@ -162,10 +159,10 @@
<select id="getFather" resultType="integer">
WITH RECURSIVE temp_table AS (
SELECT
- id, name, parent_id,special,level FROM t_department WHERE id = #{deptId}
+ id, name, parent_id,special,level FROM t_department WHERE id = #{deptId} AND deleted = 0
UNION ALL
SELECT
- so.id, so.name, so.parent_id, so.special, so.level FROM t_department so INNER JOIN temp_table tb ON so.id = tb.parent_id
+ so.id, so.name, so.parent_id, so.special, so.level FROM t_department so INNER JOIN temp_table tb ON so.id = tb.parent_id AND so.deleted = 0
)
SELECT
DISTINCT id
@@ -173,4 +170,20 @@
temp_table
</select>
+ <select id="getLevelDeptList" resultType="com.mindskip.xzs.domain.vo.CascaderDataVO">
+ SELECT id as value, name as label, parent_id, special, level FROM t_department WHERE level = #{level} AND deleted = 0
+ </select>
+
+ <select id="page1" resultType="com.mindskip.xzs.vo.SubjectVO">
+ SELECT
+ id, name
+ FROM
+ t_subject
+ WHERE
+ deleted = 0
+ <if test="query.name != null and query.name != ''">
+ AND name like concat('%', #{query.name} , '%')
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0