From 6994ee771c7e3c5b13bb2affab10af8c4bcdfadd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 21 Nov 2023 22:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/role/dataScope.html      |  2 +-
 .../resources/templates/system/role/role.html | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html
index 8b253e80e..2f3b0f751 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html
@@ -25,7 +25,7 @@
 				<div class="col-sm-8">
 					<select id="dataScope" name="dataScope" class="form-control m-b">
 						<option value="1" th:field="*{dataScope}">全部数据权限</option>
-						<option value="2" th:field="*{dataScope}">自定数据权限</option>
+						<option value="2" th:field="*{dataScope}">自定义数据权限</option>
 						<option value="3" th:field="*{dataScope}">本部门数据权限</option>
 						<option value="4" th:field="*{dataScope}">本部门及以下数据权限</option>
 						<option value="5" th:field="*{dataScope}">仅本人数据权限</option>
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html
index c16b7fd1c..f464ea576 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/role.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html
@@ -90,6 +90,27 @@
 		            title: '权限字符',
 		            sortable: true
 		        },
+		        {
+		            field: 'dataScope',
+		            title: '数据权限',
+		            formatter: function(value, item, index) {
+		                if (item.dataScope == '1') {
+		                    return '<span class="badge badge-primary">全部数据权限</span>';
+		                }
+		                else if (item.dataScope == '2') {
+		                    return '<span class="badge badge-success">自定义数据权限</span>';
+		                }
+		                else if (item.dataScope == '3') {
+		                    return '<span class="badge badge-info">本部门数据权限</span>';
+		                }
+		                else if (item.dataScope == '4') {
+		                    return '<span class="badge badge-warning">本部门及以下数据权限</span>';
+		                }
+		                else if (item.dataScope == '5') {
+		                    return '<span class="badge badge-danger">仅本人数据权限</span>';
+		                }
+		            }
+		        },
 		        {
 		            field: 'roleSort',
 		            title: '显示顺序',