From 1b54186938e52b69d8fe93bb4f1309fcc699eef5 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 10 Mar 2025 12:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=95=B0=E6=8D=AE=E6=9D=83?=
=?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/bonus/system/api/domain/SysRole.java | 11 +++++++++++
.../main/resources/mapper/system/SysRoleMapper.xml | 6 +++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
index c26731e..43ab35b 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
@@ -44,6 +44,9 @@ public class SysRole extends BaseEntity
/** 数据类型(1-组织类,2-区域类) */
private Integer dataType;
+ /** 数据类型(1-全数据类, 2-组织类,3-商户类) */
+ private Integer roleType;
+
/** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
@Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
private String dataScope;
@@ -159,6 +162,14 @@ public class SysRole extends BaseEntity
this.dataType = dataType;
}
+ public Integer getRoleType() {
+ return roleType;
+ }
+
+ public void setRoleType(Integer roleType) {
+ this.roleType = roleType;
+ }
+
public String getDataScope()
{
return dataScope;
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 14a5a24..fd43a20 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_type, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
- r.company_id, r.status, r.del_flag, r.create_time, r.remark, r.is_built_in, r.area_id
+ r.company_id, r.status, r.del_flag, r.create_time, r.remark, r.is_built_in, r.area_id, role_type
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
@@ -114,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
role_name,
role_key,
role_sort,
+ role_type,
data_type,
data_scope,
menu_check_strictly,
@@ -130,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{roleName},
#{roleKey},
#{roleSort},
+ #{roleType},
#{dataType},
#{dataScope},
#{menuCheckStrictly},
@@ -150,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
role_name = #{roleName},
role_key = #{roleKey},
role_sort = #{roleSort},
+ role_type = #{roleType},
data_type = #{dataType},
data_scope = #{dataScope},
menu_check_strictly = #{menuCheckStrictly},