From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index 164a697..84e38f0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -1,8 +1,12 @@
package com.ruoyi.system.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.mybatis.annotation.DataColumn;
+import com.ruoyi.common.mybatis.annotation.DataPermission;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -12,17 +16,23 @@
*
* @author Lion Li
*/
-public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
+public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, SysRole> {
- Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param("role") SysRole role);
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id")
+ })
+ Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
*
- * @param role 瑙掕壊淇℃伅
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
- List<SysRole> selectRoleList(SysRole role);
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id")
+ })
+ List<SysRole> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -39,7 +49,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- List<Integer> selectRoleListByUserId(Long userId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
--
Gitblit v1.9.3