From 534c9a841aad04fce5d08210a1ccf159c6df169b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:36:16 +0800
Subject: [PATCH] 1.通知公告接口修改 2.考试培训接口修改

---
 src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
index 6694ee4..9b8b669 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -40,7 +40,7 @@
         d.dict_value AS categoryName
         FROM
         blade_notice n
-        LEFT JOIN ( SELECT * FROM blade_dict WHERE CODE = 'notice' ) d ON n.category = d.dict_key
+        LEFT JOIN ( SELECT * FROM blade_dict WHERE code = 'notice' ) d ON n.category = d.dict_key
         WHERE
         n.is_deleted = 0 and n.tenant_id = #{notice.tenantId}
         <if test="notice.title!=null">
@@ -49,5 +49,14 @@
         <if test="notice.category!=null">
             and n.category = #{notice.category}
         </if>
+        <if test="notice.startTime!=null and notice.startTime!=''">
+            and n.release_time &gt;= #{notice.startTime}
+        </if>
+        <if test="notice.endTime!=null and notice.endTime!=''">
+            and n.release_time &lt;= #{notice.endTime}
+        </if>
+        <if test="notice.category!=null">
+            and n.category = #{notice.category}
+        </if>
     </select>
 </mapper>

--
Gitblit v1.9.3