From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java
index 248b7b0..c0fe756 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java
@@ -47,6 +47,10 @@
     @ApiOperation(value = "新增系统公告")
     @PostMapping(value = "/add")
     public R<Boolean> add(@RequestBody SystemBulletinDTO dto) {
+        if(dto.getStatus()==1){
+            systemBulletinService.update(Wrappers.lambdaUpdate(TSystemBulletin.class)
+                    .set(TSystemBulletin::getStatus, 2));
+        }
         systemBulletinService.save(dto);
         return R.ok();
     }
@@ -54,6 +58,10 @@
     @ApiOperation(value = "编辑系统公告")
     @PostMapping(value = "/edit")
     public R<Boolean> edit(@RequestBody SystemBulletinDTO dto) {
+        if(dto.getStatus()==1){
+            systemBulletinService.update(Wrappers.lambdaUpdate(TSystemBulletin.class)
+                    .set(TSystemBulletin::getStatus, 2));
+        }
         systemBulletinService.updateById(dto);
         return R.ok();
     }
@@ -81,7 +89,7 @@
     }
     @Log(title = "启用/禁用系统公告", businessType = BusinessType.OTHER)
     @ApiOperation(value = "启用/禁用系统公告")
-    @DeleteMapping(value = "/editStatus")
+    @GetMapping(value = "/editStatus")
     public R<Boolean> editStatus(@RequestParam String id) {
         TSystemBulletin byId = systemBulletinService.getById(id);
         if (byId.getStatus()==1){

--
Gitblit v1.7.1