diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 45545de..324ad01 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -211,7 +211,7 @@ public class CommonService { } } - public List queryAllPrjInfo(boolean isAdminQuery) { + public List queryAllPrjInfo(boolean isAdminQuery, List prjIds) { try { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) @@ -219,7 +219,7 @@ public class CommonService { .eq(EdFileInfo::getParentId, PRJ_PARENT_ID) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code); if (!isAdminQuery) { - queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code); + queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code).in(EdFileInfo::getId, prjIds); } List ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList()); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 7214323..7e9727c 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -171,7 +171,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl tree() { - List strings = commonService.queryAllPrjInfo(false); + List prjIds = permissionService.getAccessibleTree(); + if (CollUtil.isEmpty(prjIds)) { + return ElectromagneticResultUtil.success(new ArrayList<>()); + } + List strings = commonService.queryAllPrjInfo(false, prjIds); List res = new ArrayList<>(); strings.forEach(e -> { FileProjectVO fileProjectVO = JSONUtil.toList(e, FileProjectVO.class).get(0); @@ -686,6 +690,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl upload(String parentId, MultipartFile file, Integer strategy) { + Assert.isTrue(!file.isEmpty(), "禁止上传空文件"); Assert.isTrue(EleCommonUtil.isFileNameValid(file.getOriginalFilename()), NAME_VALID_MSG); // 查找下一层,看是否存在顶级定义相关文件,如果存在,则该层属于管理员层级定义的,不允许上传文件 long dirCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index 6d8b03a..c4346ff 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -222,7 +222,7 @@ public class EdPrjServiceImpl extends ServiceImpl */ @Override public ElectromagneticResult queryAllPrjInfo() { - List res = commonService.queryAllPrjInfo(true); + List res = commonService.queryAllPrjInfo(true, null); List projectVOS = new ArrayList<>(); res.forEach(e -> { ProjectVO projectVO = JSONUtil.toList(e, ProjectVO.class).get(0);