diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java index bb7098c..ff74225 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java @@ -49,6 +49,8 @@ public class FileInfoVO { private List labels; + private Integer prjDir; + // 是否是收藏数据,1是,0否 private Integer isFavorite; 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 a41dad8..7007b93 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 @@ -158,7 +158,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl { e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize())); e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0); - e.setIsPersonal(dataOwnCode == DataOwnEnum.USER_FILE.code ? 1 : 0); e.setLabels(fileTagRelationService.getFileTags(e.getId())); }); UserThreadLocal.setSuccessInfo("", "", "查询文件成功"); @@ -1430,11 +1429,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl { e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize())); e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0); - e.setIsPersonal(Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId()) ? 1 : 0); + e.setIsPersonal( (e.getPrjDir()== DataOwnEnum.USER_FILE.code && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0); // 设置权限 Map permissions = (e.getIsPersonal() == 1) ? permissionService.getPersonalPermission() - : permissionService.getUserPermission(UserThreadLocal.getUserId(), e.getId(), true); + : permissionService.getUserPermission(UserThreadLocal.getUserId(), getCategoryId(e.getId()), true); e.setPermissions(permissions); }); UserThreadLocal.setSuccessInfo("", "", "查询了收藏列表"); diff --git a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml index b1aadb0..181fdc9 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml @@ -13,6 +13,7 @@ +