区分账户搜索,1.查询用户,2.根据条件查询账户

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -470,6 +470,15 @@ public class CommunityArticleController extends BaseController {
         return AjaxResult.success(communityArticleService.selectUserBySearchValue(SearchValue));
     }
 
+    @ApiOperation("根据条件查询账户")
+    @GetMapping("/selectUserList")
+    public AjaxResult selectUserList(String SearchValue) {
+        if (Objects.isNull(SearchValue)) {
+            return AjaxResult.error();
+        }
+        return AjaxResult.success(communityArticleService.selectUsersByAccountOrName(SearchValue));
+    }
+
 
     @ApiOperation("获取关注列表")
     @GetMapping("/likeUserList")

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/community/CommunityUserInfoMapper.java

@@ -16,4 +16,11 @@ public interface CommunityUserInfoMapper extends BaseMapper<CommunityUserInfo> {
      * @return 用户
      */
     List<CommunityUserInfoVo> selectUserBySearchValue(String SearchValue);
+
+    /**
+     * 根据账户或者用户名称,搜索用户
+     * @param SearchValue
+     * @return 用户
+     */
+    List<CommunityUserInfoVo> selectUsersByAccountOrName(String SearchValue);
 }

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

@@ -538,6 +538,17 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
         return communityUserInfoMapper.selectUserBySearchValue(SearchValue);
     }
 
+    /**
+     * 根据账户或者用户名称,搜索用户
+     * @param SearchValue
+     * @return 用户
+     */
+    @Override
+    public List<CommunityUserInfoVo> selectUsersByAccountOrName(String SearchValue) {
+        return communityUserInfoMapper.selectUsersByAccountOrName(SearchValue);
+    }
+
+
     /**
      * 获取关注列表
      *

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

@@ -123,6 +123,14 @@ public interface ICommunityArticleService extends IService<CommunityArticle> {
      */
     List<CommunityUserInfoVo> selectUserBySearchValue(String SearchValue);
 
+
+    /**
+     * 根据账户或者用户名称,搜索用户
+     * @param SearchValue
+     * @return 用户
+     */
+    List<CommunityUserInfoVo> selectUsersByAccountOrName(String SearchValue);
+
     /**
      * 获取关注列表
      *

ruoyi-generator/src/main/resources/mapper/community/CommunityUserInfoMapper.xml

@@ -4,6 +4,23 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.generator.mapper.community.CommunityUserInfoMapper">
     <select id="selectUserBySearchValue" resultType="com.ruoyi.generator.vo.CommunityUserInfoVo">
+        select
+        b.id as id,
+        a.nick_name as nickName,
+        a.avatar as avatar,
+        (select count(1) as fansCount from community_user_like c where c.like_user_id = a.user_id) as fansCount,
+        (select count(1) as articleCount from community_article d where d.user_id = a.user_id) as articleCount
+        from sys_user a
+        left join community_user_info b on a.user_id = b.user_id
+        <if test="searchValue != null and searchValue != ''">
+            <where>
+                a.nick_name like concat('%', #{searchValue}, '%')
+                or b.user_id like concat('%', #{searchValue}, '%')
+            </where>
+        </if>
+
+    </select>
+    <select id="selectUsersByAccountOrName" resultType="com.ruoyi.generator.vo.CommunityUserInfoVo">
         select
         b.id as id,
         a.nick_name as nickName,
@@ -33,6 +50,5 @@
                 IFNULL(c.is_names,0)  = 0 and  a.nick_name like concat('%', #{searchValue}, '%')
             </where>
         </if>
-
     </select>
-</mapper>
+</mapper>