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/UserDepartmentMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/UserDepartmentMapper.xml b/src/main/resources/mapper/UserDepartmentMapper.xml
index 962c4ed..22a6e92 100644
--- a/src/main/resources/mapper/UserDepartmentMapper.xml
+++ b/src/main/resources/mapper/UserDepartmentMapper.xml
@@ -7,14 +7,22 @@
<result column="department_id" jdbcType="INTEGER" property="departmentId" />
</resultMap>
<sql id="Base_Column_List">
- id, user_id, department_id
+ id, user_id, department_id, dept_admin
</sql>
<insert id="insert" parameterType="com.mindskip.xzs.domain.UserDepartment" useGeneratedKeys="true" keyProperty="id">
- insert into t_user_department (id, user_id, department_id
+ insert into t_user_department (id, user_id, department_id, dept_admin
)
- values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}
+ values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{deptAdmin}
)
+ </insert>
+
+ <insert id="insertBatchByDepartmentExamine">
+ insert into t_user_department (user_id, department_id)
+ values
+ <foreach collection="departmentIds.split(',')" item="item" separator=",">
+ (#{userId}, #{item})
+ </foreach>
</insert>
<select id="selectByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -24,11 +32,24 @@
where user_id = #{userId,jdbcType=INTEGER}
</select>
+ <select id="selectDeptByUserId" resultType="com.mindskip.xzs.domain.Department">
+ SELECT
+ d.id,d.name
+ FROM t_user_department ud INNER JOIN t_department d ON ud.department_id = d.id
+ WHERE ud.user_id = #{userId} AND d.deleted = 0
+ </select>
+
<select id="selectByDepartmentId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_user_department
where department_id = #{departmentId,jdbcType=INTEGER}
+ </select>
+ <select id="selectByUser" resultType="com.mindskip.xzs.domain.UserDepartment">
+ select
+ <include refid="Base_Column_List" />
+ from t_user_department
+ where user_id=#{id}
</select>
<delete id="removeByUserId">
@@ -38,4 +59,30 @@
<delete id="removeByDepartmentId">
delete from t_user_department where department_id = #{departmentId}
</delete>
-</mapper>
\ No newline at end of file
+
+ <update id="updateUserDepartMent" parameterType="com.mindskip.xzs.domain.UserDepartment">
+ update t_user_department
+ <set>
+ <if test="user_id != null">user_id = #{userId},</if>
+ <if test="department_id != null">department_id = #{departmentId},</if>
+ </set>
+ where id = #{id}
+ </update>
+
+ <select id="getDeptUserList" resultType="com.mindskip.xzs.domain.vo.BaseSelect" >
+ SELECT
+ tu.id,
+ tu.real_name as 'value'
+ FROM
+ t_user tu
+ INNER JOIN t_user_department tud ON tud.user_id = tu.id
+ <where>
+ AND tud.department_id = #{depId}
+ </where>
+ </select>
+
+ <select id="selectDeptAdmin" resultType="java.lang.Integer">
+ SELECT user_id FROM t_user_department WHERE dept_admin = 1 AND department_id = #{depId}
+ </select>
+
+</mapper>
--
Gitblit v1.8.0