From 8cc5975fc3da9b463bbc959cb8cdbc7678b8514a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 14:15:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/app/service/impl/UserServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index edcd68b8..fee96834 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -20,7 +20,6 @@ import com.aliyuncs.profile.DefaultProfile; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.getui.push.v2.sdk.ApiHelper; import com.getui.push.v2.sdk.GtApiConfiguration; @@ -34,6 +33,7 @@ import com.getui.push.v2.sdk.dto.req.message.android.GTNotification; import com.getui.push.v2.sdk.dto.req.message.ios.Alert; import com.getui.push.v2.sdk.dto.req.message.ios.Aps; import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO; +import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.github.qcloudsms.SmsSingleSenderResult; @@ -1537,8 +1537,9 @@ public class UserServiceImpl extends ServiceImpl implements queryUserIdList = list(queryWrapper.select(UserEntity::getUserId)).stream().map(UserEntity::getUserId).collect(Collectors.toSet()); } - PageHelper.startPage(page,limit); + PageHelper.startPage(page, limit); List inviteList = baseMapper.selectInviteUserList(queryUserIdList); + List userInfoList = new ArrayList<>(); if (!inviteList.isEmpty()) { Map countInfoMap = new HashMap<>(); @@ -1562,6 +1563,9 @@ public class UserServiceImpl extends ServiceImpl implements }); } + userInfoList = userInfoList.stream() + .sorted((u1, u2) -> Integer.compare(u2.getCounts(), u1.getCounts())) // ζŒ‰ counts 降序 + .collect(Collectors.toList()); return Result.success().put("data", PageUtils.page(new PageInfo<>(userInfoList),true)); }