From c447386e06ce5927fb6e3ccb22ee673535b3f566 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 08 七月 2024 18:21:26 +0800
Subject: [PATCH] 标签增加部门字段、分页调整(未做权限)
---
src/main/resources/mapper/UserMapper.xml | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 7b36ba1..4d49779 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -341,13 +341,13 @@
WHERE
a.deleted=0
<if test="departmentId != null and departmentId.size() > 0">
- AND b.department_id IN <foreach collection="departmentId" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach>
+ AND b.department_id IN <foreach collection="departmentId" item="item" open="(" separator="," close=")"> #{item} </foreach>
</if>
<if test="userName != null and userName != ''">
AND real_name LIKE concat('%',#{userName},'%')
</if>
- <if test="role != null and role.size() > 0">
- AND role IN <foreach collection="role" item="item" open="(" separator="," close=")"> #{item} </foreach>
+ <if test="roles != null and roles.size() > 0">
+ AND role IN <foreach collection="roles" item="item" open="(" separator="," close=")"> #{item} </foreach>
</if>
GROUP BY a.id
</select>
@@ -543,26 +543,25 @@
<select id="getDeptAdmins" resultType="com.mindskip.xzs.domain.Department" parameterType="java.lang.Integer">
<if test="id != null">
- select a.id, a.name 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} order by a.id desc
+ 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} order by a.id
</if>
<if test="id == null">
- select a.id, a.name from t_department a where a.deleted = 0 order by a.id desc
+ select a.id, a.name, a.parent_id from t_department a where a.deleted = 0 order by a.id
</if>
</select>
<select id="getUserByExamByTemplateId" resultType="com.mindskip.xzs.domain.User" parameterType="com.mindskip.xzs.domain.ExamPaper">
- <![CDATA[
- SELECT DISTINCT
- d.*
- FROM
- t_exam_templates a
- INNER JOIN t_exam_templates_user_count b ON a.id = b.exam_templates_id and a.id = ${id}
- LEFT JOIN t_exam_paper_answer c ON b.exam_paper_id = c.exam_paper_id AND c.create_user = b.user_id and invalid = 0
- LEFT JOIN t_user d ON b.user_id = d.id
- WHERE
- ( c.id IS NULL OR ( user_score / paper_score ) < 0.6 )
- AND b.user_id = #{createUser}
- ]]>
+ select *
+ from t_user
+ where id in
+ (select user_id from t_exam_templates_user WHERE templates_id = #{id} and user_id not in
+ (SELECT create_user from t_exam_paper_answer where (user_score / paper_score) > 0.6 and (invalid = 0 or invalid is null) and exam_paper_id in
+ (select exam_paper_id from t_exam_templates_user_count WHERE exam_templates_id = #{id})))
+ and id = #{createUser}
+ </select>
+
+ <select id="getDeptIds" resultType="integer">
+ SELECT department_id FROM t_user_department WHERE user_id = #{userId} AND dept_admin != 1
</select>
</mapper>
--
Gitblit v1.8.0