Commit 66458738 by lixiaozhong

待接受的好友列表,对外不显示分页

parent bbed644e
...@@ -90,12 +90,12 @@ public class ImFriendController extends BaseController { ...@@ -90,12 +90,12 @@ public class ImFriendController extends BaseController {
*/ */
@PostMapping("/unsureFriends") @PostMapping("/unsureFriends")
@ApiOperation(value = "待接受的好友请求列表,最多只返回1000个") @ApiOperation(value = "待接受的好友请求列表,最多只返回1000个")
public ApiResult<Paging<ImFriendApplyDto>> getUnsureFriends() { public ApiResult<List<ImFriendApplyDto>> getUnsureFriends() {
ImClient currentClient = imClientService.getCurentClient(); ImClient currentClient = imClientService.getCurentClient();
if(currentClient == null) { if(currentClient == null) {
return ApiResult.fail(ApiCode.CLIENT_NOT_FOUNT, null); return ApiResult.fail(ApiCode.CLIENT_NOT_FOUNT, null);
} }
Paging<ImFriendApplyDto> friendInfo = imFriendService.getUnsureFriends(currentClient); List<ImFriendApplyDto> friendInfo = imFriendService.getUnsureFriends(currentClient);
return ApiResult.ok(friendInfo); return ApiResult.ok(friendInfo);
} }
......
...@@ -68,12 +68,12 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> { ...@@ -68,12 +68,12 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
* @param currentClient * @param currentClient
* @return * @return
*/ */
public Paging<ImFriendApplyDto> getUnsureFriends(ImClient currentClient) { public List<ImFriendApplyDto> getUnsureFriends(ImClient currentClient) {
ImFriendPageParam pageParam = new ImFriendPageParam(); ImFriendPageParam pageParam = new ImFriendPageParam();
pageParam.setPageSize(1000L); pageParam.setPageSize(1000L);
Page<ImFriendApplyDto> page = new PageInfo(pageParam, OrderItem.desc(getLambdaColumn(ImFriend::getCreateTime))); Page<ImFriendApplyDto> page = new PageInfo(pageParam, OrderItem.desc(getLambdaColumn(ImFriend::getCreateTime)));
IPage<ImFriendApplyDto> pageList = imFriendMapper.getUnsureFriendPageList(page, currentClient.getId()); IPage<ImFriendApplyDto> pageList = imFriendMapper.getUnsureFriendPageList(page, currentClient.getId());
return new Paging<>(pageList); return pageList.getRecords();
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment