From d2a1a34328cec50385a6c3f8a348aa6665e57c0b Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Wed, 16 Apr 2025 17:06:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=20=20=20=20=20-=20?=
 =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E6=96=87=E4=BB=B6=E6=94=B6=E8=97=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A=E6=9C=89=E6=95=88=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/EdFileInfoServiceImpl.java        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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<EdFileInfoMapper, EdFileI
     private void exportFileRelationInfo(Map<String, Object> exportInfoMap) {
         List<EdFileInfo> fileInfos = (List<EdFileInfo>) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>());
         List<String> accessibleFileIds = fileInfos.stream().map(EdFileInfo::getId).toList();
-        List<EdFileRelation> edFileRelations = edFileRelationMapper.selectList(Wrappers.lambdaQuery(EdFileRelation.class).in(EdFileRelation::getId1, accessibleFileIds)
-                .or()
-                .in(EdFileRelation::getId2, accessibleFileIds));
+        List<EdFileRelation> 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<String, Object> exportInfoMap) {
         List<EdFileInfo> fileInfos = (List<EdFileInfo>) exportInfoMap.getOrDefault(PRJ_INFO, new ArrayList<>());
         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);
     }