Эх сурвалжийг харах

优化文章userIds获取文章

fangzhen 6 сар өмнө
parent
commit
5d96e6d2b7

+ 7 - 0
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityArticle.java

@@ -120,6 +120,13 @@ public class CommunityArticle implements Serializable {
     @ApiModelProperty("是否已删除")
     private Boolean isDelete;
 
+    /**
+     * 用户id集合
+     */
+    @ApiModelProperty("用户id集合")
+    @TableField(exist = false)
+    private List<Long> userIds;
+
     /**
      * 创建者
      */

+ 4 - 3
ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.generator.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -19,7 +18,10 @@ import org.springframework.stereotype.Service;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -136,7 +138,6 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
         //如果没有圈子,则返回null数据
         if (Objects.isNull(circleIds) || circleIds.isEmpty()) {
             communityArticleVos = new ArrayList<>();
-            return communityArticleVos;
         }
 
         //根据分类查找文章

+ 6 - 0
ruoyi-generator/src/main/resources/mapper/community/ArticleMapper.xml

@@ -178,6 +178,12 @@
             <if test="communityArticle.userId != null and communityArticle.userId != ''">
                 AND a.user_id = #{communityArticle.userId}
             </if>
+            <if test="communityArticle.userIds != null and communityArticle.userIds.size > 0">
+                AND a.user_id in
+                <foreach collection="communityArticle.userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
             and (is_delete != 1 or is_delete is null)
         </where>
         group by a.id,a.create_time