From fdf9b33851d5fe193aa93f4bc803aa69a267083e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 17 十月 2022 10:28:57 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
index 74da103..118028c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
@@ -14,7 +14,10 @@
import com.sandu.ximon.admin.param.PlatformFilePermissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.PlatformFileListBo;
-import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.Client;
+import com.sandu.ximon.dao.domain.PlatformFile;
+import com.sandu.ximon.dao.domain.PlatformFileUser;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlatformFileMapper;
import lombok.AllArgsConstructor;
@@ -90,16 +93,18 @@
throw new BusinessException("鍒犻櫎鏃跺弬鏁颁笉鑳戒负绌�!");
}
List<PlatformFile> platformFiles = listByIds(param.getFileIds());
- if (platformFiles == null && platformFiles.size() == 0) {
+ if (platformFiles == null || platformFiles.size() == 0) {
throw new BusinessException("鏈壘鍒版枃浠�!");
}
- //鍒犻櫎鍏崇郴
- boolean remove = platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
- if (remove) {
- //鍒犻櫎鏂囦欢
- return removeByIds(param.getFileIds());
+
+ //鑾峰彇鍏崇郴
+ List<PlatformFileUser> list = platformFileUserService.list(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
+ if (!list.isEmpty()) {
+ //鍒犻櫎鍏崇郴
+ platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
}
- return false;
+ //鍒犻櫎鏂囦欢
+ return removeByIds(param.getFileIds());
}
@@ -120,7 +125,7 @@
.list(Wrappers.lambdaQuery(PlatformFileUser.class).eq(PlatformFileUser::getUserId, SecurityUtils.getUserId()));
List<Long> fileIdList = platformFileUsers.stream().map(PlatformFileUser::getFileId).collect(Collectors.toList());
- if(fileIdList.size() == 0){
+ if (fileIdList.size() == 0) {
fileIdList.add(-1L);
}
PageHelper.startPage(vo.getPageNo(), vo.getPageSize());
--
Gitblit v1.9.3