From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/EducationResourceMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/EducationResourceMapper.xml b/src/main/resources/mapper/EducationResourceMapper.xml
index cb750e2..4180bc8 100644
--- a/src/main/resources/mapper/EducationResourceMapper.xml
+++ b/src/main/resources/mapper/EducationResourceMapper.xml
@@ -32,6 +32,9 @@
<if test="query.classId != null">
AND ter.class_id = #{query.classId}
</if>
+ <if test="query.contentType != null and query.contentType != '' ">
+ AND ter.content_type = #{query.contentType}
+ </if>
</where>
ORDER BY
ter.create_time DESC
@@ -65,6 +68,9 @@
<if test="query.subjectId != null">
AND ter.subject_id = #{query.subjectId}
</if>
+ <if test="query.contentType != null and query.contentType != '' ">
+ AND ter.content_type = #{query.contentType}
+ </if>
</where>
ORDER BY
ter.create_time DESC
--
Gitblit v1.8.0