From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamTemplatesMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ExamTemplatesMapper.xml b/src/main/resources/mapper/ExamTemplatesMapper.xml
index 8dffc26..d685c3d 100644
--- a/src/main/resources/mapper/ExamTemplatesMapper.xml
+++ b/src/main/resources/mapper/ExamTemplatesMapper.xml
@@ -62,6 +62,7 @@
left join t_exam_templates_user u on e.id = u.templates_id
LEFT JOIN t_exam_templates_subject ts ON e.id = ts.templates_id
LEFT JOIN t_subject s ON ts.subject_id = s.id
+ LEFT JOIN t_user_department tud ON e.create_user = tud.user_id
<where>
<if test="status != null">
and e.status = 0
@@ -73,7 +74,7 @@
and u.user_id = #{userId}
</if>
<if test="deptId != null and deptId.size() > 0">
- and e.dept_id in <foreach collection="deptId" item="item" separator="," open="(" close=")"> #{item} </foreach>
+ and tud.department_id in <foreach collection="deptId" item="item" separator="," open="(" close=")"> #{item} </foreach>
</if>
<if test="name != null and name != ''">
and INSTR(e.name, #{name})
--
Gitblit v1.8.0