From 0f9ee3de2c058b934cb6e495f9120f7764983e1f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 27 九月 2022 09:23:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 1c224d0..08841ca 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
@@ -8,15 +8,13 @@
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.AllUserInfoParam;
import com.sandu.ximon.admin.param.EditFileParam;
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.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.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlatformFileMapper;
import lombok.AllArgsConstructor;
@@ -95,13 +93,15 @@
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());
}
@@ -116,10 +116,18 @@
List<PlatformFileListBo> platformFileListBos;
if (AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
PageHelper.startPage(vo.getPageNo(), vo.getPageSize());
- platformFileListBos = baseMapper.fileLiet(keyword, null);
+ platformFileListBos = baseMapper.fileList(keyword, null);
} else {
+ List<PlatformFileUser> platformFileUsers = SpringContextHolder.getBean(PlatformFileUserService.class)
+ .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){
+ fileIdList.add(-1L);
+ }
PageHelper.startPage(vo.getPageNo(), vo.getPageSize());
- platformFileListBos = baseMapper.fileLiet(keyword, SecurityUtils.getUserId());
+ platformFileListBos = baseMapper.fileList(keyword, fileIdList);
+
}
return platformFileListBos;
}
--
Gitblit v1.9.3