查询合集下所有文章信息查询代码优化

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityCollectionServiceImpl.java

@@ -169,11 +169,19 @@ public class CommunityCollectionServiceImpl extends ServiceImpl<CommunityCollect
         if (searchType == 1) {
             // 查询最新的文章
             communityArticles = communityArticleMapper.selectList(
-                    new QueryWrapper<CommunityArticle>().in("id", articleIds).orderByDesc("create_time"));
+                    new QueryWrapper<CommunityArticle>().in("id", articleIds).and((wrapper) -> {
+                        wrapper.ne("is_delete", true)
+                                .or()
+                                .isNull("is_delete");
+                    }).orderByDesc("create_time"));
         } else{
             // 查询最早的文章
             communityArticles = communityArticleMapper.selectList(
-                    new QueryWrapper<CommunityArticle>().in("id", articleIds).orderByAsc("create_time"));
+                    new QueryWrapper<CommunityArticle>().in("id", articleIds).and((wrapper) -> {
+                        wrapper.ne("is_delete", true)
+                                .or()
+                                .isNull("is_delete");
+                    }).orderByAsc("create_time"));
         }