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

fix:修改收藏权限

This commit is contained in:
s2042968 2025-03-07 14:12:51 +08:00
parent 959433bbe7
commit b311ba2c11
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java
View File

@ -49,6 +49,8 @@ public class FileInfoVO {
private List<FileTagInfo> labels;
private Integer prjDir;
// 是否是收藏数据，1是，0否
private Integer isFavorite;

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -158,7 +158,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
records.forEach(e -> {
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<EdFileInfoMapper, EdFileI
fileInfoVOIPage.getRecords().forEach(e -> {
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<String, Boolean> 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("", "", "查询了收藏列表");

1
electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml
View File

@ -13,6 +13,7 @@
<result column="parent_id" property="parentId"/>
<result column="category_id" property="categoryId"/>
<result column="data_type" property="dataType"/>
<result column="prj_dir" property="prjDir"/>
<result column="data_status" property="dataStatus"/>
<result column="save_status" property="saveStatus"/>
<result column="file_size" property="fileSize"/>