From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 825ffd3..2920e96 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -105,8 +105,11 @@
public Result remove(List<String> ids) {
//鍒ゆ柇娲诲姩id鏄惁宸茬粡瀛樺湪鎶ュ悕浜哄憳
for(String id : ids){
- canDeleteActivity(id);
-
+ Result result = canDeleteActivity(id);
+ Integer code = (Integer) result.get("code");
+ if (code != 200){
+ return result;
+ }
}
return Result.ok("鍒犻櫎鎴愬姛");
@@ -146,9 +149,9 @@
//鍒犻櫎娲诲姩鍚屾椂鍒犻櫎娲诲姩鐨勭浉鍏充俊鎭�
public void delActivityAndInformation(Activity activity){
- if (StringUtils.isNotEmpty(activity.getCover())){
- lmkFileService.deleteObject(activity.getCover());
- }
+// if (StringUtils.isNotEmpty(activity.getCover())){
+// lmkFileService.deleteObject(activity.getCover());
+// }
baseMapper.deleteById(activity.getId());
//鍒犻櫎瀹℃牳璁板綍
activityAuditRecordService.delActivityAuditById(activity.getId());
--
Gitblit v1.8.0