From 2a46259ac136e4318a6a0ddde632f9fd481c2441 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 22 七月 2024 09:50:02 +0800
Subject: [PATCH] fix：成绩统计修改为统计选择参考的部门，即使无人参考
---
src/main/resources/mapper/UserMapper.xml | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 099b1d3..1a1de5d 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -523,28 +523,30 @@
</update>
<update id="cancelUserDeptAdmin">
- update t_user set role = 1 where id in(
- select user_id from t_user_department where department_id = #{id} and user_id not in
- <foreach collection="adminIds" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- and user_id not in
- (select user_id from t_user_department where dept_admin = 1 and user_id in
- (select user_id from t_user_department where department_id = #{id} and user_id not in
- <foreach collection="adminIds" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- )))
+ update t_user set role = 1 where id in
+ <foreach collection="userIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
</update>
<select id="getDeptAdminIds" resultType="java.lang.Integer" parameterType="java.lang.Integer">
- select department_id from t_user_department where dept_admin = 1 and user_id = #{id}
+ select department_id from t_user_department where dept_admin = 1 and user_id = #{userId}
</select>
- <select id="getDeptAdmins" resultType="com.mindskip.xzs.domain.Department" parameterType="java.lang.Integer">
- <if test="id != null">
+ <select id="getDeptAdminIdAndInfo" resultType="com.mindskip.xzs.domain.Department">
+ select
+ d.id, d.name, d.special
+ from
+ t_user_department ud
+ INNER JOIN t_department d ON ud.department_id = d.id
+ WHERE
+ dept_admin = 1 and user_id = #{userId}
+ </select>
+
+ <select id="getDeptAdmins" resultType="com.mindskip.xzs.domain.Department">
+ <if test="ids != null and ids.size() != 0">
WITH RECURSIVE temp_table AS (
- select a.id, a.name, a.parent_id from t_department a inner join t_user_department b on a.id = b.department_id where a.deleted = 0 and b.dept_admin = 1 and b.user_id = #{id}
+ select a.id, a.name, a.parent_id from t_department a WHERE id IN <foreach collection="ids" item="id" open="(" separator="," close=")"> #{id} </foreach>
UNION ALL
SELECT
so.id, so.name, so.parent_id FROM t_department so INNER JOIN temp_table tb ON so.parent_id = tb.id
@@ -554,7 +556,7 @@
FROM
temp_table
</if>
- <if test="id == null">
+ <if test="ids == null or ids.size() == 0">
select a.id, a.name, a.parent_id from t_department a where a.deleted = 0 order by a.id
</if>
</select>
@@ -587,7 +589,7 @@
</select>
<select id="getFailTemplateUser" resultType="com.mindskip.xzs.domain.User">
- SELECT *
+ SELECT id, real_name
FROM t_user
WHERE id IN
(SELECT user_id FROM t_exam_templates_user WHERE templates_id = #{id} AND user_id NOT IN
--
Gitblit v1.8.0