From be18f0eed6a03352b7435e2507b08143b4e8dfc0 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Tue, 22 Apr 2025 17:54:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java    | 5 +----
 1 file changed, 1 insertion(+), 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 973253c..074f310 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
@@ -1400,10 +1400,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public boolean removeFavorite(String userId, String fileId) {
-        LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EdFileFavorite::getUserId, userId)
-                .eq(EdFileFavorite::getFileId, fileId);
-        boolean isRemoved = fileFavoriteService.remove(queryWrapper);
+        boolean isRemoved = fileFavoriteService.logicRemove(userId, fileId);
         if (isRemoved) {
             UserThreadLocal.setSuccessInfo("", fileId, StrFormatter.format("取消了收藏"));
         }

From 77cf01c3722a5474cf821e015bb249aba8515003 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Wed, 23 Apr 2025 14:22:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 db8b816..42f0053 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
@@ -1386,7 +1386,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     public boolean isFavorite(String userId, String fileId) {
         LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EdFileFavorite::getUserId, userId)
-                .eq(EdFileFavorite::getFileId, fileId);
+                .eq(EdFileFavorite::getFileId, fileId)
+                .eq(EdFileFavorite::getEffectFlag, EffectFlagEnum.EFFECT.code);
         return fileFavoriteService.getOne(queryWrapper) != null;
     }
 
@@ -1428,7 +1429,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             fileIds = this.baseMapper.selectList(queryWrapper).stream().map(EdFileInfo::getFileId).toList();
         } else {
             LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.select(EdFileFavorite::getFileId).eq(EdFileFavorite::getUserId, userId);
+            queryWrapper.select(EdFileFavorite::getFileId)
+                    .eq(EdFileFavorite::getUserId, userId)
+                    .eq(EdFileFavorite::getEffectFlag, EffectFlagEnum.EFFECT.code);
             fileIds = fileFavoriteService.listObjs(queryWrapper, Object::toString);
         }