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 75c166d..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 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; } @@ -1399,10 +1400,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl 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("取消了收藏")); } @@ -1431,7 +1429,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl 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); }