changes

liuhaonan

2022-10-24 c5ef81f257e0176cdcfce034779a15f544d6694c

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java

@@ -8,6 +8,7 @@
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;
@@ -92,7 +93,7 @@
            throw new BusinessException("删除时参数不能为空!");
        }
        List<PlatformFile> platformFiles = listByIds(param.getFileIds());
        if (platformFiles == null && platformFiles.size() == 0) {
        if (platformFiles == null || platformFiles.size() == 0) {
            throw new BusinessException("未找到文件!");
        }

@@ -118,10 +119,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;
    }