From 7f25606654ebe94b5d82cfd9f74275989c71538d Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 七月 2024 11:47:40 +0800
Subject: [PATCH] feat:默认选中当前部门

---
 src/main/resources/mapper/ExamPaperMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 90f6c53..587632c 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -276,6 +276,9 @@
       <if test="type != null ">
         and e.type= #{type}
       </if>
+      <if test="name != null and name != ''">
+        AND INSTR(name, #{name})
+      </if>
     </where>
     group by e.id
   </select>
@@ -327,7 +330,7 @@
 
   <select id="indexPaper" resultMap="PaperInfoResultMap" parameterType="com.mindskip.xzs.viewmodel.student.dashboard.PaperFilter">
       select * from(
-      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time
+      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time,e.create_time
       FROM t_exam_paper e
       LEFT JOIN t_exam_paper_department d on d.exam_paper_id = e.id
       <where>
@@ -354,7 +357,7 @@
       ORDER BY e.id desc ) t
       union all
       select * from (
-      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time
+      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time,e.create_time
       FROM t_exam_paper e
       LEFT JOIN t_exam_paper_user u on u.exam_paper_id = e.id
       <where>
@@ -488,7 +491,7 @@
         <if test="excludeTagIds != null and excludeTagIds.size > 0">
           <if test="tagIds != null and tagIds.size > 0">and</if>
           <foreach collection="excludeTagIds" open="(" separator="and" close=")" item="item">
-            not find_in_set(#{item}, group_concat(b.tag_id))
+            (NOT find_in_set(#{item}, group_concat(b.tag_id)) OR group_concat(b.tag_id) IS NULL)
           </foreach>
         </if>
       order by a.id

--
Gitblit v1.8.0