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