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)); }