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-04-16 17:06:12 +08:00
parent f7275abe20
commit d2a1a34328
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -831,16 +831,23 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
private void exportFileRelationInfo(Map<String, Object> exportInfoMap) { private void exportFileRelationInfo(Map<String, Object> exportInfoMap) {
List<EdFileInfo> fileInfos = (List<EdFileInfo>) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); List<EdFileInfo> fileInfos = (List<EdFileInfo>) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>());
List<String> accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList(); List<String> accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList();
List<EdFileRelation> edFileRelations = edFileRelationMapper.selectList(Wrappers.lambdaQuery(EdFileRelation.class).in(EdFileRelation::getId1, accessibleFileIds) List<EdFileRelation> edFileRelations = edFileRelationMapper.selectList(
Wrappers.lambdaQuery(EdFileRelation.class)
.eq(EdFileRelation::getEffectFlag, EffectFlagEnum.EFFECT.code)
.and(wrapper -> wrapper
.in(EdFileRelation::getId1, accessibleFileIds)
.or() .or()
.in(EdFileRelation::getId2, accessibleFileIds)); .in(EdFileRelation::getId2, accessibleFileIds)));
exportInfoMap.put(ED_FILE_RELATION, edFileRelations); exportInfoMap.put(ED_FILE_RELATION, edFileRelations);
} }
private void exportCollectionInfo(Map<String, Object> exportInfoMap) { private void exportCollectionInfo(Map<String, Object> exportInfoMap) {
List<EdFileInfo> fileInfos = (List<EdFileInfo>) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>()); List<EdFileInfo> fileInfos = (List<EdFileInfo>) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>());
List<String> accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList(); List<String> accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList();
List<EdFileFavorite> edFileFavorites = edFileFavoriteMapper.selectList(Wrappers.lambdaQuery(EdFileFavorite.class).in(EdFileFavorite::getFileId, accessibleFileIds)); List<EdFileFavorite> edFileFavorites = edFileFavoriteMapper.selectList(
Wrappers.lambdaQuery(EdFileFavorite.class)
.eq(EdFileFavorite::getEffectFlag, EffectFlagEnum.EFFECT.code)
.in(EdFileFavorite::getFileId, accessibleFileIds));
exportInfoMap.put(ED_FILE_FAVORITE, edFileFavorites); exportInfoMap.put(ED_FILE_FAVORITE, edFileFavorites);
} }