chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改回收站查询的bug

This commit is contained in:
chenxudong 2025-03-24 14:08:35 +08:00
parent d5a6459734
commit d9ffa2438d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
View File

@ -86,6 +86,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
.orderByAsc(ObjUtil.equals(pars.getFileTypeSort(), 0), EdFileInfo::getSort)
.orderByDesc(ObjUtil.equals(pars.getFileTypeSort(), 1), EdFileInfo::getSort);
if (StrUtil.isNotEmpty(pars.getKeyword())) {
queryWrapper.and(qr -> qr.like(EdFileInfo::getFileName, pars.getKeyword())
.or()
@ -95,17 +96,18 @@ public class FileRecycleServiceImpl implements FileRecycleService {
.or()
.like(EdFileInfo::getFileContent, pars.getKeyword()));
}
// TODO 要考虑数据是个人数据还是库数据，如果是管理员，则展示全部数据，其他用户则展示有权限的系统数据+用户个人数据+库数据
if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) {
List<String> accessibleTree = permissionService.getAccessibleTree();
queryWrapper.and(qr -> qr.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId()).eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_FILE.code));
if (CollUtil.isNotEmpty(accessibleTree)) {
for (String permission : accessibleTree) {
queryWrapper.or().likeRight(EdFileInfo::getFileCode, permission);
}
}
}
if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) {
List<String> ids = edFileInfoMapper.selectList(Wrappers.<EdFileInfo>lambdaQuery().select(EdFileInfo::getId).eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_FILE.code))
.stream()
.map(EdFileInfo::getId)
.collect(Collectors.toList());
List<String> accessibleTree = permissionService.getAccessibleTree();
accessibleTree.addAll(ids);
if (CollUtil.isNotEmpty(accessibleTree)) {
queryWrapper.and(qr -> accessibleTree.forEach(e -> qr.or().likeRight(EdFileInfo::getFilePath, e)));
}
}
Page<EdFileInfo> edFileInfoPage = this.edFileInfoMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
long total = edFileInfoPage.getTotal();
List<FileRecycleQueryVO> records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileRecycleQueryVO.class);