From d20202956f68bd5a7ea98d70f1ff11fe99cf9e5c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 16 九月 2022 10:43:48 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..74da103 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;
@@ -116,10 +114,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