diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java
index 642ce330..10122965 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
 import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
 import io.swagger.annotations.Api;
@@ -41,6 +42,14 @@ public class PushConcernFanController {
         return R.ok(list.getRecords(), list.getTotal());
     }
 
+    @ApiOperation("分页查询好友列表")
+    @GetMapping("/listFriend")
+    public R removeById(Page page, @RequestParam Map map) {
+        map.put("createById", SecurityUtils.getUser().getId());
+        IPage<Map<String, Object>> list = iPushConcernFanService.selectPushFriendList(page, map);
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
     @ApiOperation("根据ID查询")
     @GetMapping("/{id:\\w+}")
     public R getById(@PathVariable("id") String id) {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java
index 27355c7f..03751b6d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java
@@ -24,4 +24,6 @@ public interface PushConcernFanMapper extends BaseMapper<PushConcernFan> {
 
     Map<String, Object> getByPushConcernFanId(String id);
 
+    IPage<Map<String, Object>> selectPushFriendList(@Param("page") IPage<Map<String, Object>> page, @Param("map") Map map);
+
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanService.java
index 1d11160a..1250bf97 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanService.java
@@ -30,4 +30,11 @@ public interface IPushConcernFanService extends IService<PushConcernFan> {
      */
     Map<String, Object> getByPushConcernFanId(String id);
 
+    /**
+     * 查询好友列表
+     * @param
+     * @return
+     */
+    IPage<Map<String, Object>> selectPushFriendList(IPage<Map<String, Object>> page, Map<String, Object> map);
+
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
index cf7acf56..503aacce 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
@@ -1,10 +1,10 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
 import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
 import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -29,4 +29,9 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
     public Map<String, Object> getByPushConcernFanId(String id) {
         return baseMapper.getByPushConcernFanId(id);
     }
+
+    @Override
+    public IPage<Map<String, Object>> selectPushFriendList(IPage<Map<String, Object>> page, Map<String, Object> map) {
+        return baseMapper.selectPushFriendList(page, map);
+    }
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
index b75aa624..95fce2e8 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
@@ -85,5 +85,24 @@
     </where>
   </select>
 
+  <select id="selectPushFriendList" resultType="Map">
+    SELECT
+    cf.`status` cf_status,
+    b.id b_id,
+    u.*
+    FROM
+    sys_user u
+    LEFT JOIN common_push_concern_fan cf ON u.id = cf.concern_user_id
+    LEFT JOIN common_push_blacklist b ON u.id = b.concern_user_id
+    <where>
+      u.del_flag = 0 AND u.status = 0
+      <if test="map.createById != null and map.createById != ''">
+        AND  u.id != #{map.createById}
+      </if>
+      <if test="map.nickName != null and map.nickName != ''">
+        AND u.nick_name = #{map.nickName}
+      </if>
+    </where>
+  </select>
 
 </mapper>
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
index e12cf8c5..14e6f9a4 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
@@ -56,6 +56,7 @@ public class UserController {
     private LambdaQueryWrapper<User> getQueryWrapper(User user) {
         return new LambdaQueryWrapper<User>()
                 .like(StrUtil.isNotBlank(user.getUserName()), User::getUserName, user.getUserName())
+                .like(StrUtil.isNotBlank(user.getNickName()), User::getNickName, user.getNickName())
                 .eq(StrUtil.isNotBlank(user.getDeptId()), User::getDeptId, user.getDeptId())
                 .eq(StrUtil.isNotBlank(user.getId()), User::getId, user.getId())
                 .eq(StrUtil.isNotBlank(user.getUserType()), User::getUserType, user.getUserType())