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 | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml
index 5d54e83..6270696 100644
--- a/src/main/resources/mapper/DepartmentMapper.xml
+++ b/src/main/resources/mapper/DepartmentMapper.xml
@@ -5,29 +5,36 @@
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="deleted" jdbcType="VARCHAR" property="deleted"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="special" property="special"/>
+ <result column="level" property="level"/>
</resultMap>
<sql id="Base_Column_List">
id
- , name,deleted
+ , name,deleted,parent_id,special,level
</sql>
<insert id="add" parameterType="com.mindskip.xzs.domain.Department" useGeneratedKeys="true" keyProperty="id">
- insert into t_department (name, deleted)
- values (#{name,jdbcType=VARCHAR}, #{deleted,jdbcType=VARCHAR})
+ insert into t_department (name, deleted, parent_id,special,level)
+ values (#{name,jdbcType=VARCHAR}, #{deleted,jdbcType=VARCHAR}, #{parentId}, #{special.value},#{level})
</insert>
<update id="update" parameterType="com.mindskip.xzs.domain.Department">
update t_department
<set>
+ parent_id = #{parentId},
<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>
+ <if test="special != null and special != ''">
+ special = #{special.value},
+ </if>
+ <if test="level != null">
+ level = #{level},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
@@ -37,38 +44,64 @@
SELECT
td.id,
td.name,
- td.admin_id as adminId,
- tu.real_name as adminName
+ td.parent_id,
+ td.special,
+ td.level
FROM
t_department td
- LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
WHERE
td.deleted = 0
+ <if test="deptId != null and deptId.size() > 0">
+ AND td.id in <foreach collection="deptId" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach>
+ </if>
</select>
<select id="getById" resultMap="BaseResultMap">
SELECT
td.id,
td.name,
- td.admin_id as adminId,
- tu.real_name as adminName
+ td.parent_id,
+ td.special,
+ td.level
FROM
t_department td
- LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
WHERE
td.id = #{id} AND td.deleted = 0
</select>
- <select id="page" resultType="com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM"
+ <resultMap id="pageResult" type="com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM">
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <collection column="id" property="adminIds" ofType="integer" select="selectUserIdsByDeptId"></collection>
+ <collection column="id" property="adminNames" ofType="integer" select="selectUserNamesByDeptId"></collection>
+ </resultMap>
+
+ <select id="selectUserIdsByDeptId" resultType="integer">
+ SELECT
+ tu.id
+ FROM
+ t_user_department tud
+ INNER JOIN t_user tu ON tud.user_id = tu.id AND tud.department_id = #{deptId} AND tu.status = 1 AND deleted = 0 AND tud.dept_admin = 1
+ </select>
+
+ <select id="selectUserNamesByDeptId" resultType="string">
+ SELECT
+ tu.real_name
+ FROM
+ t_user_department tud
+ INNER JOIN t_user tu ON tud.user_id = tu.id AND tud.department_id = #{deptId} AND tu.status = 1 AND deleted = 0 AND tud.dept_admin = 1
+ </select>
+
+ <select id="page" resultMap="pageResult"
parameterType="com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM">
SELECT
td.id,
td.name,
- td.admin_id as adminId,
- tu.real_name as adminName
+ td.parent_id,
+ td.special,
+ td.level
FROM
t_department td
- LEFT JOIN t_user tu ON td.admin_id = tu.id AND tu.deleted = 0
<where>
AND td.deleted = 0
<if test="id != null ">
@@ -85,6 +118,9 @@
SELECT
td.id,
td.name,
+ td.parent_id,
+ td.special,
+ td.level,
td.admin_id as adminId,
tu.real_name as adminName
FROM
@@ -95,7 +131,59 @@
</select>
<select id="selectByAdminId" resultType="integer">
- SELECT id FROM t_department WHERE admin_id = #{id} AND deleted = 0
+ SELECT id FROM t_department WHERE admin_id = #{userId} AND deleted = 0
+ </select>
+
+ <select id="countByAdminId" resultType="integer">
+ SELECT count(*) FROM t_department WHERE admin_id = #{userId} AND deleted = 0 AND id != #{id}
+ </select>
+
+ <select id="list" resultType="com.mindskip.xzs.domain.vo.CascaderDataVO">
+ SELECT id as value, name as label, parent_id, special, level FROM t_department WHERE deleted = 0
+ </select>
+
+ <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> 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 AND so.deleted = 0
+ )
+ SELECT
+ DISTINCT id
+ FROM
+ temp_table
+ </select>
+
+ <select id="getFather" resultType="integer">
+ WITH RECURSIVE temp_table AS (
+ SELECT
+ 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 AND so.deleted = 0
+ )
+ SELECT
+ DISTINCT id
+ FROM
+ 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