From ff169f9a0417b73f0afac554cf2f9d048ac56c80 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 19 八月 2024 20:57:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
index 06838a6..de7171d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
@@ -35,15 +35,27 @@
     }
 
     @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "删除")
-    @PostMapping(value = "/deleteById/{id}")
-    public AjaxResult deleteById(@PathVariable Integer id) {
-        noticeService.removeById(id);
+    @DeleteMapping(value = "/deleteById")
+    public AjaxResult deleteById(String ids) {
+        String[] split = ids.split(",");
+        for (String id : split) {
+            noticeService.removeById(id);
+        }
+
         return AjaxResult.success();
     }
 
     @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "查询")
     @PostMapping(value = "/pageList")
     public AjaxResult<Page<TNotice>> authPageList(@RequestBody NoticeQueryDto query) {
+        if (query.getStatus()==null){
+
+                return AjaxResult.success(noticeService.lambdaQuery()
+                        .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+                        .page(Page.of(query.getPageCurr(),query.getPageSize())));
+
+        }
+
             if (query.getStatus()==0){
                 return AjaxResult.success(noticeService.lambdaQuery()
                         .le(TNotice::getStartTime, LocalDateTime.now())

--
Gitblit v1.7.1