From 2bc69b919ef626e6093d598d7eae07c8f9e3e0e4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 10:56:51 +0800
Subject: [PATCH] 仁和东区代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 e75a452..523656f 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,7 @@
 
 import javax.annotation.Resource;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.BeanUtils;
@@ -108,8 +109,13 @@
      * @return 角色集合
      */
     @Override
-    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));
+    public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize,String areaCode) {
+        LambdaQueryWrapper<SysRoleDO> queryWrapper=new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId);
+        if(com.panzhihua.common.utlis.StringUtils.isNotEmpty(areaCode)){
+            queryWrapper.eq(SysRoleDO::getAreaCode,areaCode);
+        }
+        queryWrapper.orderByDesc(SysRoleDO::getCreateAt);
+        IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
         if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
             return R.fail("角色列表为空");
         }

--
Gitblit v1.7.1