Merge branch 'dev-jdk17' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into dev-jdk17

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

@@ -1399,10 +1399,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public boolean removeFavorite(String userId, String fileId) {
-        LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
+        boolean isRemoved = fileFavoriteService.logicRemove(userId, fileId);
-        queryWrapper.eq(EdFileFavorite::getUserId, userId)
-                .eq(EdFileFavorite::getFileId, fileId);
-        boolean isRemoved = fileFavoriteService.remove(queryWrapper);
         if (isRemoved) {
             UserThreadLocal.setSuccessInfo("", fileId, StrFormatter.format("取消了收藏"));
         }