From 6424b512f4bb4bef24c90f6fcf200b217bab866a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 04 六月 2025 09:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 2df2c5e..d0a291f 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
@@ -62,10 +63,18 @@
return R.ok(systemBulletinService.getById(id));
}
+
+ @Log(title = "删除系统公告", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除系统公告")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ systemBulletinService.removeById(id);
+ return R.ok();
+ }
@Log(title = "批量删除系统公告", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除系统公告")
- @DeleteMapping(value = "/delete")
- public R<Boolean> edit(@RequestParam String ids) {
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestParam String ids) {
String[] split = ids.split(",");
systemBulletinService.removeBatchByIds(Arrays.asList(split));
return R.ok();
@@ -78,6 +87,12 @@
if (byId.getStatus()==1){
byId.setStatus(2);
}else{
+ // 查询是否存在已启用的公告
+ long count = systemBulletinService.count(Wrappers.lambdaQuery(TSystemBulletin.class)
+ .eq(TSystemBulletin::getStatus, 1));
+ if (count>0){
+ return R.fail("已有启用公告，请将旧公告禁用");
+ }
byId.setStatus(1);
}
systemBulletinService.updateById(byId);
--
Gitblit v1.7.1