From 8be4769bf80c5e28152875a1428e39a9d369e18c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 26 九月 2021 15:35:50 +0800
Subject: [PATCH] Merge branch 'four_member' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 17 ++++++-----------
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java | 2 +-
6 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
index a1a360e..cf6fa8e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
@@ -84,9 +84,9 @@
@ApiOperation(value = "角色下拉列表", response = RoleVO.class)
@GetMapping("listrolebackstage")
- public R listRoleBackstage() {
- Long communityId = 0l;
- return userService.listRoleBackstage(communityId);
+ public R listRoleBackstage(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
+ Long communityId = 0L;
+ return userService.listRoleBackstage(communityId,pageNum,pageSize);
}
@ApiOperation(value = "分页查询后台用户", response = AdministratorsUserVO.class)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index c945acd..94326a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -371,7 +371,7 @@
* @return 角色集合
*/
@PostMapping("/role/listrolebackstage")
- R listRoleBackstage(@RequestParam("communityId") Long communityId);
+ R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
/**
* 分页查询后台用户
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java
index 670813a..ffc7edf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java
@@ -81,9 +81,9 @@
@ApiOperation(value = "角色下拉列表", response = RoleVO.class)
@GetMapping("listrolebackstage")
- public R listRoleBackstage() {
+ public R listRoleBackstage(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
Long communityId = this.getCommunityId();
- return userService.listRoleBackstage(communityId);
+ return userService.listRoleBackstage(communityId,pageNum,pageSize);
}
@ApiOperation(value = "分页查询后台用户", response = AdministratorsUserVO.class)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
index b0c17b6..2ca7455 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
@@ -66,8 +66,8 @@
* @return 角色集合
*/
@PostMapping("listrolebackstage")
- public R listRoleBackstage(@RequestParam("communityId") Long communityId) {
- return roleService.listRoleBackstage(communityId);
+ public R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
+ return roleService.listRoleBackstage(communityId,pageNum,pageSize);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java
index fdda7fd..6491ec1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java
@@ -46,7 +46,7 @@
* 对应社区 0 表示运营后台
* @return 角色集合
*/
- R listRoleBackstage(Long communityId);
+ R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize);
/**
* 新增角色
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