From 9308ec4dcadc96f4d93541148fa844cfcc70c762 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 18 五月 2023 16:44:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/BroadcastController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/BroadcastController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/BroadcastController.java
index 8e03a30..9436e1b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/BroadcastController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/BroadcastController.java
@@ -39,7 +39,9 @@
     })
     public ResponseWarpper<List<String>> queryBroadcast(){
         try {
-            List<Broadcast> broadcasts = broadcastService.selectList(new EntityWrapper<Broadcast>().eq("status", 1).orderBy("sort desc limit 0, 5"));
+            List<Broadcast> broadcasts = broadcastService.selectList(new EntityWrapper<Broadcast>()
+                    .eq("`status`", 1).eq("`show`", 1)
+                    .eq("`upDown`", 1).orderBy("`sort` desc limit 0, 5"));
             List<String> list = new ArrayList<>();
             for (Broadcast broadcast : broadcasts) {
                 list.add(broadcast.getContent());

--
Gitblit v1.7.1