From e3e2903c0083445c907dad1be6e5ff250e877413 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 26 九月 2021 15:29:12 +0800
Subject: [PATCH] 修改提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
index 95b58e7..18fe43f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -6,6 +6,8 @@
 
 import javax.annotation.Resource;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -106,19 +108,12 @@
      * @return 角色集合
      */
     @Override
-    public R listRoleBackstage(Long communityId) {
-        List<SysRoleDO> sysRoleDOS =
-            roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
-        if (ObjectUtils.isEmpty(sysRoleDOS)) {
+    public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize) {
+        IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
+        if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
             return R.fail("角色列表为空");
         }
-        List<RoleVO> roleVOS = new ArrayList<>();
-        sysRoleDOS.forEach(sysRoleDO -> {
-            RoleVO roleVO = new RoleVO();
-            BeanUtils.copyProperties(sysRoleDO, roleVO);
-            roleVOS.add(roleVO);
-        });
-        return R.ok(roleVOS);
+        return R.ok(sysRoleDOIPage);
     }
 
     /**

--
Gitblit v1.7.1