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 d43fb70..e907f23 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 @@ -151,7 +151,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl(0, new ArrayList<>())); } - queryWrapper.in(EdFileInfo::getId, fileIdsWithTags); + queryWrapper.in(EdFileInfo::getFileId, fileIdsWithTags); } Page edFileInfoPage = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper); @@ -160,7 +160,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl { e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize())); e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0); - e.setLabels(fileTagRelationService.getFileTags(e.getId())); + e.setLabels(fileTagRelationService.getFileTags(e.getFileId())); }); UserThreadLocal.setSuccessInfo("", "", "查询文件成功"); return ElectromagneticResultUtil.success(new RespPageVO<>(total, records)); @@ -1077,6 +1077,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl { e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize())); e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0); - e.setIsPersonal((String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0); + if (String.valueOf(DataOwnEnum.REPO_FILE.code).equals(e.getDataOwn())) { + e.setIsPersonal(2); + } else if (String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) { + e.setIsPersonal(1); + } else { + e.setIsPersonal(0); + } // 设置权限 Map permissions = (e.getIsPersonal() == 1) ? permissionService.getPersonalPermission()