From f01bb5966a55bd35754476c11d9c8afa6bc7f659 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 21:25:51 +0800
Subject: [PATCH] update 使用 MP 分页工具 重构业务
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 2673c81..9d4b10a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -1,13 +1,14 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
@@ -40,6 +41,12 @@
@Autowired
private SysRoleDeptMapper roleDeptMapper;
+ @Override
+ @DataScope(deptAlias = "d")
+ public TableDataInfo<SysRole> selectPageRoleList(SysRole role) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageRoleList(PageUtils.buildPage(), role));
+ }
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
*
@@ -49,20 +56,7 @@
@Override
@DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role) {
- Map<String, Object> params = role.getParams();
- Object dataScope = params.get("dataScope");
- return list(new LambdaQueryWrapper<SysRole>()
- .like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
- .eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
- .like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
- .apply(Validator.isNotEmpty(params.get("beginTime")),
- "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
- params.get("beginTime"))
- .apply(Validator.isNotEmpty(params.get("endTime")),
- "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
- params.get("endTime"))
- .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
- .orderByAsc(SysRole::getRoleSort));
+ return baseMapper.selectRoleList(role);
}
/**
--
Gitblit v1.9.3