From ca6fbb909f5b404a4f72a7974b9861b6e8b05f3f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 18 Mar 2026 19:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8A=BD=E5=B1=89=E6=95=88=E6=9E=9C=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysRoleController.java  |  28 +
 .../resources/templates/system/role/role.html | 382 +++++------
 .../resources/templates/system/role/view.html | 623 ++++++++++++++++++
 .../com/ruoyi/common/constant/Constants.java  |  33 +-
 .../framework/aspectj/DataScopeAspect.java    |  38 +-
 .../resources/mapper/system/SysRoleMapper.xml |   2 +-
 6 files changed, 884 insertions(+), 222 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/role/view.html
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index adbe9bb4..21199224 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.Ztree;
@@ -23,6 +24,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.shiro.util.AuthorizationUtils;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 
@@ -46,6 +48,9 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ISysMenuService menuService;
+
     @RequiresPermissions("system:role:view")
     @GetMapping()
     public String role()
@@ -323,4 +328,27 @@ public class SysRoleController extends BaseController
         List<Ztree> ztrees = deptService.roleDeptTreeData(role);
         return ztrees;
     }
+
+    /**
+     * 查看角色详情
+     */
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/view/{roleId}")
+    public String view(@PathVariable("roleId") Long roleId, ModelMap mmap)
+    {
+        roleService.checkRoleDataScope(roleId);
+        SysRole role = roleService.selectRoleById(roleId);
+        mmap.put("role", role);
+        // 菜单权限
+        mmap.put("menuTree", menuService.roleMenuTreeData(role, getUserId()));
+        // 数据权限部门：仅自定义数据权限时传已勾选部门节点
+        if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()))
+        {
+            List<Ztree> deptTree = deptService.roleDeptTreeData(role);
+            mmap.put("deptTree", deptTree);
+        }
+        // 关联用户数量
+        mmap.put("userCount", roleService.countUserRoleByRoleId(roleId));
+        return prefix + "/view";
+    }
 }
\ No newline at end of file
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 f464ea57..be1ad181 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/role.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html
@@ -1,190 +1,194 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('角色列表')" />
-</head>
-<body class="gray-bg">
-	<div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 search-collapse">
-				<form id="role-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								角色名称：<input type="text" name="roleName"/>
-							</li>
-							<li>
-								权限字符：<input type="text" name="roleKey"/>
-							</li>
-							<li>
-								角色状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
-									<option value="">所有</option>
-									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-								</select>
-							</li>
-							<li class="select-time">
-								<label>创建时间： </label>
-								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
-								<span>-</span>
-								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
-							</li>
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-		
-			<div class="btn-group-sm" id="toolbar" role="group">
-				<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
-	                <i class="fa fa-plus"></i> 新增
-	            </a>
-	            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:role:edit">
-		            <i class="fa fa-edit"></i> 修改
-		        </a>
-				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
-		            <i class="fa fa-remove"></i> 删除
-		        </a>
-		        <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export">
-		            <i class="fa fa-download"></i> 导出
-		        </a>
-	        </div>
-	        
-	        <div class="col-sm-12 select-table table-striped">
-			    <table id="bootstrap-table"></table>
-			</div>
-		</div>
-	</div>
-	<th:block th:include="include :: footer" />
-	<script th:inline="javascript">
-		var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
-		var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
-		var prefix = ctx + "system/role";
-		
-
-		$(function() {
-		    var options = {
-		        url: prefix + "/list",
-		        createUrl: prefix + "/add",
-		        updateUrl: prefix + "/edit/{id}",
-		        removeUrl: prefix + "/remove",
-		        exportUrl: prefix + "/export",
-		        sortName: "roleSort",
-		        modalName: "角色",
-		        columns: [{
-		            checkbox: true
-		        },
-		        {
-		            field: 'roleId',
-		            title: '角色编号'
-		        },
-		        {
-		            field: 'roleName',
-		            title: '角色名称',
-		            sortable: true
-		        },
-		        {
-		            field: 'roleKey',
-		            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: '显示顺序',
-		            sortable: true
-		        },
-		        {
-		        	visible: editFlag == 'hidden' ? false : true,
-		        	title: '角色状态',
-		        	align: 'center',
-		        	formatter: function (value, row, index) {
-		        		return statusTools(row);
-		        	}
-		        },
-		        {
-		            field: 'createTime',
-		            title: '创建时间',
-		            sortable: true
-		        },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	if (row.roleId != 1) {
-		                    var actions = [];
-		                    actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-		                    actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a> ');
-		                    var more = [];
-		                    more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authDataScope(" + row.roleId + ")'><i class='fa fa-check-square-o'></i>数据权限</a> ");
-		                    more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
-		                    actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
-		                    return actions.join('');
-		            	} else {
-		                    return "";
-		                }
-		            }
-		        }]
-		    };
-		    $.table.init(options);
-		});
-		
-		/* 角色管理-分配数据权限 */
-		function authDataScope(roleId) {
-		    var url = prefix + '/authDataScope/' + roleId;
-		    $.modal.open("分配数据权限", url);
-		}
-		
-		/* 角色管理-分配用户 */
-		function authUser(roleId) {
-		    var url = prefix + '/authUser/' + roleId;
-		    $.modal.openTab("分配用户", url);
-		}
-		
-		/* 角色状态显示 */
-		function statusTools(row) {
-		    if (row.status == 1) {
-    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.roleId + '\')"></i> ';
-    		} else {
-    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.roleId + '\')"></i> ';
-    		}
-		}
-		
-		/* 角色管理-停用 */
-		function disable(roleId) {
-			$.modal.confirm("确认要停用角色吗？", function() {
-				$.operate.post(prefix + "/changeStatus", { "roleId": roleId, "status": 1 });
-		    })
-		}
-
-		/* 角色管理启用 */
-		function enable(roleId) {
-			$.modal.confirm("确认要启用角色吗？", function() {
-				$.operate.post(prefix + "/changeStatus", { "roleId": roleId, "status": 0 });
-		    })
-		}
-	</script>
-</body>
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('角色列表')" />
+</head>
+<body class="gray-bg">
+	<div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="role-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								角色名称：<input type="text" name="roleName"/>
+							</li>
+							<li>
+								权限字符：<input type="text" name="roleKey"/>
+							</li>
+							<li>
+								角色状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
+							<li class="select-time">
+								<label>创建时间： </label>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<span>-</span>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+		
+			<div class="btn-group-sm" id="toolbar" role="group">
+				<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
+	                <i class="fa fa-plus"></i> 新增
+	            </a>
+	            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:role:edit">
+		            <i class="fa fa-edit"></i> 修改
+		        </a>
+				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
+		            <i class="fa fa-remove"></i> 删除
+		        </a>
+		        <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export">
+		            <i class="fa fa-download"></i> 导出
+		        </a>
+	        </div>
+	        
+	        <div class="col-sm-12 select-table table-striped">
+			    <table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<script th:inline="javascript">
+		var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
+		var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
+		var prefix = ctx + "system/role";
+		
+
+		$(function() {
+		    var options = {
+		        url: prefix + "/list",
+		        createUrl: prefix + "/add",
+		        updateUrl: prefix + "/edit/{id}",
+		        removeUrl: prefix + "/remove",
+		        exportUrl: prefix + "/export",
+		        viewUrl: prefix + "/view/{id}",
+		        sortName: "roleSort",
+		        modalName: "角色",
+		        columns: [{
+		            checkbox: true
+		        },
+		        {
+		            field: 'roleId',
+		            title: '角色编号'
+		        },
+		        {
+		            field: 'roleName',
+		            title: '角色名称',
+		            sortable: true,
+		            formatter: function(value, row, index) {
+		                return '<a href="javascript:void(0)" onclick="$.operate.view(\'' + row.roleId + '\')">' + value + '</a>';
+		            }
+		        },
+		        {
+		            field: 'roleKey',
+		            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: '显示顺序',
+		            sortable: true
+		        },
+		        {
+		        	visible: editFlag == 'hidden' ? false : true,
+		        	title: '角色状态',
+		        	align: 'center',
+		        	formatter: function (value, row, index) {
+		        		return statusTools(row);
+		        	}
+		        },
+		        {
+		            field: 'createTime',
+		            title: '创建时间',
+		            sortable: true
+		        },
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	if (row.roleId != 1) {
+		                    var actions = [];
+		                    actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                    actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+		                    var more = [];
+		                    more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authDataScope(" + row.roleId + ")'><i class='fa fa-check-square-o'></i>数据权限</a> ");
+		                    more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
+		                    actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
+		                    return actions.join('');
+		            	} else {
+		                    return "";
+		                }
+		            }
+		        }]
+		    };
+		    $.table.init(options);
+		});
+		
+		/* 角色管理-分配数据权限 */
+		function authDataScope(roleId) {
+		    var url = prefix + '/authDataScope/' + roleId;
+		    $.modal.open("分配数据权限", url);
+		}
+		
+		/* 角色管理-分配用户 */
+		function authUser(roleId) {
+		    var url = prefix + '/authUser/' + roleId;
+		    $.modal.openTab("分配用户", url);
+		}
+		
+		/* 角色状态显示 */
+		function statusTools(row) {
+		    if (row.status == 1) {
+    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.roleId + '\')"></i> ';
+    		} else {
+    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.roleId + '\')"></i> ';
+    		}
+		}
+		
+		/* 角色管理-停用 */
+		function disable(roleId) {
+			$.modal.confirm("确认要停用角色吗？", function() {
+				$.operate.post(prefix + "/changeStatus", { "roleId": roleId, "status": 1 });
+		    })
+		}
+
+		/* 角色管理启用 */
+		function enable(roleId) {
+			$.modal.confirm("确认要启用角色吗？", function() {
+				$.operate.post(prefix + "/changeStatus", { "roleId": roleId, "status": 0 });
+		    })
+		}
+	</script>
+</body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/view.html b/ruoyi-admin/src/main/resources/templates/system/role/view.html
new file mode 100644
index 00000000..2eb8702e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/role/view.html
@@ -0,0 +1,623 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('角色详情')" />
+    <style>.perm-tree{margin:0;padding:0;list-style:none;font-size:13px;display:flex;flex-wrap:wrap;gap:0}.tree-group{display:inline-block;vertical-align:top;margin:0 10px 12px 0;min-width:130px}.tree-group-title{font-weight:600;color:#fff;padding:4px 10px;background:#337ab7;border-radius:3px 3px 0 0;white-space:nowrap;font-size:12px}.tree-group-title i{margin-right:4px}.tree-group-body{border:1px solid #d0e4f5;border-top:0;border-radius:0 0 3px 3px;padding:4px 8px;background:#f7fbff}.tree-children{margin:0;padding:0;list-style:none}.tree-item{line-height:22px;color:#444;white-space:nowrap;font-size:12px}.tree-sub-group{margin-top:4px}.tree-sub-title{font-weight:600;color:#555;font-size:12px;line-height:22px;border-bottom:1px dashed #ddd;margin-bottom:1px}.tree-sub-title i{color:#f0ad4e;margin-right:3px}.tree-sub-children{padding-left:10px}.tree-item .icon-check{color:#5cb85c;margin-right:3px}.tree-item .icon-perm{color:#aaa;margin-right:3px;font-size:10px}.user-search-bar{margin:10px 0 14px 0}.user-search-inner{position:relative;display:flex;align-items:center;max-width:420px;border:1px solid #c8dff5;border-radius:20px;background:#fff;padding:0 12px;transition:border-color .2s,box-shadow .2s}.user-search-inner:focus-within{border-color:#337ab7;box-shadow:0 0 0 2px rgba(51,122,183,.12)}.user-search-icon{color:#aaa;font-size:13px;margin-right:8px;flex-shrink:0}.user-search-inner input{flex:1;border:0;outline:0;font-size:13px;line-height:34px;background:transparent;color:#333}.user-search-inner input::placeholder{color:#bbb}.user-search-clear{cursor:pointer;color:#bbb;font-size:14px;margin-left:6px;flex-shrink:0;line-height:1}.user-search-clear:hover{color:#888}.user-search-count{font-size:12px;color:#888;margin-left:10px;white-space:nowrap;flex-shrink:0}.user-card.hidden{display:none}.user-card mark{background:#fff3cd;color:#333;padding:0;border-radius:2px}#userTableWrap{margin-top:4px}.user-card-grid{display:flex;flex-wrap:wrap;gap:14px;margin-top:10px}.user-card{width:240px;border:1px solid #dce8f5;border-radius:5px;padding:14px 16px;background:#f7fbff;font-size:13px;line-height:24px;position:relative}.user-card .user-avatar{width:42px;height:42px;border-radius:50%;background:#337ab7;color:#fff;font-size:18px;font-weight:bold;text-align:center;line-height:42px;display:inline-block;margin-right:10px;vertical-align:middle;flex-shrink:0}.user-card .user-name{font-weight:600;font-size:14px;vertical-align:middle}.user-card .user-meta{color:#555;margin-top:8px}.user-card .user-meta span{display:block}.user-card .user-status{position:absolute;top:10px;right:10px;font-size:11px;padding:1px 7px;border-radius:10px}.user-card .user-status.normal{background:#dff0d8;color:#3c763d}.user-card .user-status.disable{background:#f2dede;color:#a94442}.dept-tree{margin:0;padding:0;list-style:none;font-size:13px}.dept-tree li{line-height:26px}.dept-tag{display:inline-block;padding:2px 10px;border-radius:3px;font-size:12px;background:#dff0d8;color:#3c763d;border:1px solid #d6e9c6;margin:2px 0}.dept-tag i{margin-right:3px}.dept-ancestor{color:#999;font-size:12px}.dept-ancestor i{margin-right:2px}.dept-children{padding-left:16px;border-left:1px dashed #d6e9c6;margin-left:8px}.perm-empty{color:#999;font-style:italic;font-size:13px}#menuTableWrap{background-color:#f9f9f9;border-radius:4px;border:1px solid #eee;margin-top:10px}#menuTableWrap .form-group{margin-bottom:0}#menuTableWrap .perm-tree{max-height:300px;overflow-y:auto;padding:10px;background-color:#fff;border:1px solid #ddd;border-radius:3px}#loadMoreBtn{padding:6px 20px;border:1px solid #dcdcdc;background:#f8f9fa;color:#666;border-radius:4px;transition:all .3s}#loadMoreBtn:hover{background:#e9ecef;border-color:#c8d0d7}#loadMoreBtn:disabled{opacity:.6;cursor:not-allowed}#loadingMore{color:#888}</style>
+</head>
+<body>
+    <div class="main-content">
+        <form class="form-horizontal" th:object="${role}">
+            <h4 class="form-header h4">基本信息</h4>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">角色名称：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext" th:text="*{roleName}"></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">权限字符：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext" th:text="*{roleKey}"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">角色状态：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext">
+                                <span th:if="*{status == '0'}" class="badge badge-success">正常</span>
+                                <span th:if="*{status != '0'}" class="badge badge-danger">停用</span>
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">数据范围：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext">
+                                <span th:if="*{dataScope == '1'}" class="badge badge-primary">全部数据权限</span>
+                                <span th:if="*{dataScope == '2'}" class="badge badge-success">自定义数据权限</span>
+                                <span th:if="*{dataScope == '3'}" class="badge badge-info">本部门数据权限</span>
+                                <span th:if="*{dataScope == '4'}" class="badge badge-warning">本部门及以下数据权限</span>
+                                <span th:if="*{dataScope == '5'}" class="badge badge-danger">仅本人数据权限</span>
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">创建者：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext" th:text="*{#strings.defaultString(createBy,'-')}"></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">创建时间：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext"
+                               th:text="*{createTime != null ? #dates.format(createTime,'yyyy-MM-dd HH:mm:ss') : '-'}"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">更新者：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext" th:text="*{#strings.defaultString(updateBy,'-')}"></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">更新时间：</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-plaintext"
+                               th:text="*{updateTime != null ? #dates.format(updateTime,'yyyy-MM-dd HH:mm:ss') : '-'}"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-xs-2 control-label">备注：</label>
+                        <div class="col-xs-10">
+                            <p class="form-control-plaintext" th:text="*{#strings.defaultString(remark,'-')}"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <h4 class="form-header h4">数据权限</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-xs-2 control-label">数据范围：</label>
+                        <div class="col-xs-10">
+                            <p class="form-control-plaintext">
+                                <span th:if="*{dataScope == '1'}">全部数据权限 &mdash; 可查看系统内所有数据</span>
+                                <span th:if="*{dataScope == '2'}">自定义数据权限 &mdash; 仅可查看下方勾选部门的数据</span>
+                                <span th:if="*{dataScope == '3'}">本部门数据权限 &mdash; 仅可查看本部门数据</span>
+                                <span th:if="*{dataScope == '4'}">本部门及以下数据权限 &mdash; 可查看本部门及其下级部门数据</span>
+                                <span th:if="*{dataScope == '5'}">仅本人数据权限 &mdash; 仅可查看本人数据</span>
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" th:if="*{dataScope == '2'}">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-xs-2 control-label">自定义部门：</label>
+                        <div class="col-xs-10" style="padding-top:6px;">
+                            <div id="deptPermArea"><span class="perm-empty">加载中...</span></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <h4 class="form-header h4">菜单权限</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-xs-2 control-label">已分配菜单：</label>
+                        <div class="col-xs-10" style="padding-top:6px;">
+                            <strong id="menuCountBadge">0</strong> 个菜单权限
+                            &nbsp;
+                            <a href="javascript:void(0);"
+                               class="btn btn-info btn-xs"
+                               id="btnToggleMenus"
+                               onclick="toggleMenuList()">
+                                <i class="fa fa-list"></i> 查看已分配菜单
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- 内嵌菜单权限树（展开/收起） -->
+            <div id="menuTableWrap" style="display:none; padding: 0 15px 10px 15px;">
+                <div class="row">
+                    <div class="col-sm-12">
+                        <div class="form-group">
+                            <div style="padding-top:6px;">
+                                <ul class="perm-tree" id="menuPermTree">
+                                    <li class="perm-empty">加载中...</li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <h4 class="form-header h4">关联用户</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-xs-2 control-label">已分配用户数：</label>
+                        <div class="col-xs-10" style="padding-top:6px;">
+                            <strong id="userCountBadge" th:text="${userCount}">0</strong> 个关联用户 
+                            &nbsp;
+                            <a href="javascript:void(0);"
+                               class="btn btn-info btn-xs"
+                               id="btnToggleUsers"
+                               onclick="toggleUserList()">
+                                <i class="fa fa-users"></i> 查看已分配用户
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- 内嵌用户列表（展开/收起） -->
+            <div id="userTableWrap" style="display:none; padding: 0 15px 10px 15px;">
+                <!-- 搜索栏 -->
+                <div class="user-search-bar" id="userSearchBar" style="display:none;">
+                    <div class="user-search-inner">
+                        <i class="fa fa-search user-search-icon"></i>
+                        <input type="text" id="userSearchInput"
+                               placeholder="搜索用户名、登录名、手机号..."
+                               oninput="filterUserCards(this.value)"
+                               autocomplete="off"/>
+                        <span class="user-search-clear" id="userSearchClear"
+                              onclick="clearUserSearch()" style="display:none;">
+                            <i class="fa fa-times-circle"></i>
+                        </span>
+                        <span class="user-search-count" id="userSearchCount"></span>
+                    </div>
+                </div>
+
+                <span id="userLoadingTip" style="display:none; color:#999; font-size:13px;">
+                    <i class="fa fa-spinner fa-spin"></i> 加载中...
+                </span>
+                <span id="userEmptyTip" style="display:none; color:#999; font-style:italic; font-size:13px;">
+                    该角色暂无分配用户
+                </span>
+                <div class="user-card-grid" id="userCardGrid"></div>
+                <!-- 加载更多按钮 -->
+                <div id="loadMoreWrap" style="display:none; text-align:center; padding:20px 0;">
+                    <button id="loadMoreBtn" class="btn btn-default btn-sm" onclick="loadMoreUsers()">
+                        <i class="fa fa-refresh"></i> 加载更多
+                    </button>
+                    <div id="loadingMore" style="display:none; color:#888; font-size:13px; margin-top:5px;">
+                        <i class="fa fa-spinner fa-spin"></i> 正在加载...
+                    </div>
+                </div>
+                <div id="userNoMatchTip" style="display:none; padding:20px 0; text-align:center; color:#999; font-size:13px;">
+                    <i class="fa fa-search" style="font-size:24px; display:block; margin-bottom:6px; color:#ccc;"></i>
+                    未找到匹配的用户
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var ctx       = [[@{/}]];
+        var roleId    = [[${role.roleId}]];
+        var menuNodes = [[${menuTree}]];
+        var deptNodes = [[${deptTree != null ? deptTree : '[]'}]];
+        var pageNum = 1;        // 当前页码
+        var pageSize = 100;     // 每页显示数量
+        var totalUsers = 0;     // 用户总数
+        var isLoading = false;  // 防止重复加载
+        var hasMore = true;     // 是否还有更多数据
+        var allUsers = [];      // 存储所有已加载的用户数据（用于搜索筛选）
+
+        function buildTree(nodes) {
+            var map = {}, roots = [];
+            nodes.forEach(function(n) {
+                map[n.id] = {
+                    id: n.id, pId: n.pId,
+                    title: n.title || n.name,
+                    checked: n.checked,
+                    children: []
+                };
+            });
+            nodes.forEach(function(n) {
+                var node = map[n.id];
+                if (n.pId && map[n.pId]) {
+                    map[n.pId].children.push(node);
+                } else {
+                    roots.push(node);
+                }
+            });
+            return roots;
+        }
+
+        /* 判断节点或其后代中是否存在任意 checked 节点 */
+        function hasChecked(node) {
+            if (node.checked) return true;
+            return node.children.some(function(c) { return hasChecked(c); });
+        }
+
+        /* 菜单权限树渲染 */
+        function renderMenuTree(nodes) {
+            var roots = buildTree(nodes).filter(function(r) { return hasChecked(r); });
+            if (roots.length === 0) {
+                return '<li class="perm-empty">暂无菜单权限</li>';
+            }
+            var html = '';
+            roots.forEach(function(root) {
+                html += '<li class="tree-group">';
+                html += '<div class="tree-group-title"><i class="fa fa-th-list"></i>' + root.title + '</div>';
+                html += '<div class="tree-group-body">';
+                html += renderMenuLevel(root.children);
+                html += '</div></li>';
+            });
+            return html;
+        }
+
+        function renderMenuLevel(children) {
+            if (!children || children.length === 0) return '';
+            var visible = children.filter(function(c) { return hasChecked(c); });
+            if (visible.length === 0) return '';
+
+            var html = '<ul class="tree-children">';
+            visible.forEach(function(node) {
+                var hasKids = node.children && node.children.length > 0;
+                var kidChecked = hasKids && node.children.some(function(c) { return hasChecked(c); });
+
+                if (hasKids && kidChecked) {
+                    // 中间层：子分组标题 + 递归渲染子节点
+                    html += '<li class="tree-item tree-sub-group">';
+                    html += '<div class="tree-sub-title"><i class="fa fa-folder-open"></i>' + node.title + '</div>';
+                    html += '<div class="tree-sub-children">' + renderMenuLevel(node.children) + '</div>';
+                    html += '</li>';
+                } else {
+                    // 叶子节点（按钮权限、无下级菜单页面等）
+                    var icon = node.checked
+                        ? '<i class="fa fa-check icon-check"></i>'
+                        : '<i class="fa fa-minus icon-perm"></i>';
+                    html += '<li class="tree-item">' + icon + node.title + '</li>';
+                }
+            });
+            html += '</ul>';
+            return html;
+        }
+
+        /* 部门权限树渲染 */
+        function renderDeptTree(nodes) {
+            if (!nodes || nodes.length === 0) {
+                return '<span class="perm-empty">暂无自定义部门权限</span>';
+            }
+            var roots = buildTree(nodes);
+            var anyChecked = nodes.some(function(n) { return n.checked; });
+            if (!anyChecked) {
+                return '<span class="perm-empty">暂无自定义部门权限</span>';
+            }
+            return '<ul class="dept-tree">' + renderDeptLevel(roots) + '</ul>';
+        }
+
+        function renderDeptLevel(nodes) {
+            var html = '';
+            nodes.forEach(function(node) {
+                if (!hasChecked(node)) return;
+                html += '<li>';
+                if (node.checked) {
+                    html += '<span class="dept-tag"><i class="fa fa-building-o"></i>' + node.title + '</span>';
+                } else {
+                    // 未勾选的祖先节点，淡色展示作为路径提示
+                    html += '<span class="dept-ancestor"><i class="fa fa-angle-right"></i>' + node.title + '</span>';
+                }
+                if (node.children && node.children.length > 0) {
+                    var inner = renderDeptLevel(node.children);
+                    if (inner) {
+                        html += '<div class="dept-children"><ul class="dept-tree">' + inner + '</ul></div>';
+                    }
+                }
+                html += '</li>';
+            });
+            return html;
+        }
+
+        /* 初始化 */
+        $(function() {
+            // 渲染菜单树
+            var menuTreeHtml = renderMenuTree(menuNodes);
+            $('#menuPermTree').html(menuTreeHtml);
+            
+            // 初始化菜单数量
+            updateMenuCount();
+            
+            // 渲染部门树
+            if ($('#deptPermArea').length) {
+                $('#deptPermArea').html(renderDeptTree(deptNodes));
+            }
+        });
+        
+        /* 菜单权限：展开 / 收起内嵌菜单树 */
+        var menuLoaded = false;
+        var menuListVisible = false;
+        
+        function toggleMenuList() {
+            var $wrap = $('#menuTableWrap');
+            var $btn  = $('#btnToggleMenus');
+            if (menuListVisible) {
+                $wrap.slideUp(150);
+                $btn.html('<i class="fa fa-list"></i> 查看已分配菜单');
+                menuListVisible = false;
+            } else {
+                $wrap.slideDown(150);
+                $btn.html('<i class="fa fa-list"></i> 收起菜单列表');
+                menuListVisible = true;
+                if (!menuLoaded) { 
+                    // 菜单树已经在页面加载时渲染，这里只需要标记为已加载
+                    menuLoaded = true;
+                    // 计算并更新菜单数量
+                    updateMenuCount();
+                }
+            }
+        }
+        
+        /* 计算并更新菜单权限数量 */
+        function updateMenuCount() {
+            var $menuTree = $('#menuPermTree');
+            var menuCount = 0;
+            
+            // 计算已分配的菜单数量
+            if (menuNodes && Array.isArray(menuNodes)) {
+                // 只计算被选中的节点
+                menuCount = menuNodes.filter(function(node) {
+                    return node.checked === true;
+                }).length;
+            }
+            
+            // 更新显示
+            $('#menuCountBadge').text(menuCount);
+        }
+
+        /* 关联用户：展开 / 收起内嵌用户卡片列表 */
+        var userLoaded = false;
+        var userListVisible = false;
+
+        function toggleUserList() {
+            var $wrap = $('#userTableWrap');
+            var $btn  = $('#btnToggleUsers');
+            if (userListVisible) {
+                $wrap.slideUp(150);
+                $btn.html('<i class="fa fa-users"></i> 查看已分配用户');
+                userListVisible = false;
+            } else {
+                $wrap.slideDown(150);
+                $btn.html('<i class="fa fa-users"></i> 收起用户列表');
+                userListVisible = true;
+                if (!userLoaded) { loadUserCards(); }
+            }
+        }
+
+        function loadUserCards() {
+            var $grid    = $('#userCardGrid');
+            var $loading = $('#userLoadingTip');
+            var $empty   = $('#userEmptyTip');
+            var $loadMoreWrap = $('#loadMoreWrap');
+        
+            // 重置状态
+            $grid.empty();
+            allUsers = [];
+            pageNum = 1;
+            hasMore = true;
+            $loadMoreWrap.hide();
+            
+            $loading.show();
+            $empty.hide();
+            $('#userSearchBar').hide();
+            $('#userNoMatchTip').hide();
+        
+            // 获取用户总数
+            totalUsers = parseInt($('#userCountBadge').text()) || 0;
+            
+            if (totalUsers === 0) {
+                $loading.hide();
+                $empty.show();
+                return;
+            }
+        
+            // 第一次加载
+            loadUsersAjax();
+        }
+
+        /* 用户搜索 / 筛选 */
+        function filterUserCards(keyword) {
+            var kw = $.trim(keyword).toLowerCase();
+            var $cards = $('#userCardGrid .user-card');
+            var totalLoaded = $cards.length;
+            var $clear = $('#userSearchClear');
+        
+            $clear.toggle(kw.length > 0);
+        
+            if (kw === '') {
+                $cards.removeClass('hidden');
+                updateSearchCount(totalLoaded, allUsers.length);
+                $('#userNoMatchTip').hide();
+                return;
+            }
+        
+            var matched = 0;
+            $cards.each(function() {
+                var search = $(this).data('search') || '';
+                if (search.indexOf(kw) !== -1) {
+                    $(this).removeClass('hidden');
+                    matched++;
+                } else {
+                    $(this).addClass('hidden');
+                }
+            });
+        
+            updateSearchCount(matched, totalLoaded);
+            $('#userNoMatchTip').toggle(matched === 0);
+        }
+
+        function updateSearchCount(matched, total) {
+            var kw = $.trim($('#userSearchInput').val());
+            var totalAllUsers = allUsers.length;
+            
+            if (kw) {
+                $('#userSearchCount').text('找到 ' + matched + ' 人 (已加载 ' + totalAllUsers + '/' + totalUsers + ' 人)');
+            } else {
+                $('#userSearchCount').text('已加载 ' + totalAllUsers + '/' + totalUsers + ' 人');
+            }
+        }
+
+        function clearUserSearch() {
+            $('#userSearchInput').val('').focus();
+            filterUserCards('');
+        }
+        
+        
+        /* 加载用户的AJAX请求 */
+        function loadUsersAjax() {
+            if (isLoading || !hasMore) return;
+            
+            isLoading = true;
+            $('#loadingMore').show();
+            $('#loadMoreBtn').prop('disabled', true);
+            
+            $.ajax({
+                url  : ctx + 'system/role/authUser/allocatedList',
+                type : 'POST',
+                data : { 
+                    roleId: roleId, 
+                    pageNum: pageNum,
+                    pageSize: pageSize
+                },
+                success: function(res) {
+                    isLoading = false;
+                    $('#loadingMore').hide();
+                    $('#loadMoreBtn').prop('disabled', false);
+                    
+                    var rows = (res && res.rows) ? res.rows : [];
+                    var total = res.total || 0;
+                    
+                    // 更新用户总数
+                    if (total > 0 && total !== totalUsers) {
+                        totalUsers = total;
+                        $('#userCountBadge').text(total);
+                    }
+                    
+                    if (rows.length === 0 && pageNum === 1) {
+                        // 第一页就没有数据
+                        $('#userLoadingTip').hide();
+                        $('#userEmptyTip').show();
+                        return;
+                    }
+                    
+                    // 渲染用户卡片
+                    renderUserCards(rows);
+                    
+                    // 添加到所有用户列表（用于搜索）
+                    allUsers = allUsers.concat(rows);
+                    
+                    // 判断是否还有更多数据
+                    var loadedCount = (pageNum - 1) * pageSize + rows.length;
+                    hasMore = loadedCount < totalUsers;
+                    
+                    if (hasMore) {
+                        $('#loadMoreWrap').show();
+                    } else {
+                        $('#loadMoreWrap').hide();
+                    }
+                    
+                    // 更新页面状态
+                    pageNum++;
+                    
+                    // 第一次加载完成时显示搜索栏
+                    if (pageNum === 2) {
+                        $('#userLoadingTip').hide();
+                        $('#userSearchBar').show();
+                        updateSearchCount(rows.length, loadedCount);
+                    } else {
+                        updateSearchCount(rows.length, loadedCount);
+                    }
+                    
+                    userLoaded = true;
+                },
+                error: function() {
+                    isLoading = false;
+                    $('#loadingMore').hide();
+                    $('#loadMoreBtn').prop('disabled', false);
+                    
+                    if (pageNum === 1) {
+                        $('#userLoadingTip').hide();
+                        $('#userEmptyTip').text('加载失败，请重试').show();
+                    } else {
+                        alert('加载失败，请重试');
+                    }
+                }
+            });
+        }
+        
+        /* 渲染用户卡片 */
+        function renderUserCards(users) {
+            var $grid = $('#userCardGrid');
+            
+            users.forEach(function(u) {
+                var initial  = (u.userName || u.loginName || '?').charAt(0).toUpperCase();
+                var statusHtml = u.status === '0'
+                    ? '<span class="user-status normal">正常</span>'
+                    : '<span class="user-status disable">停用</span>';
+                
+                // 搜索关键词
+                var searchKey = [u.userName || '', u.loginName || '', u.phonenumber || ''].join('|').toLowerCase();
+                
+                var card = [
+                    '<div class="user-card" data-search="' + searchKey + '">',
+                    statusHtml,
+                    '<div style="display:flex;align-items:center;margin-bottom:4px;">',
+                    '  <span class="user-avatar">' + initial + '</span>',
+                    '  <span class="user-name">' + (u.userName || '-') + '</span>',
+                    '</div>',
+                    '<div class="user-meta">',
+                    '  <span><i class="fa fa-user-o" style="width:14px;color:#888"></i> ' + (u.loginName || '-') + '</span>',
+                    '  <span><i class="fa fa-phone"  style="width:14px;color:#888"></i> ' + (u.phonenumber || '-') + '</span>',
+                    '  <span><i class="fa fa-envelope-o" style="width:14px;color:#888"></i> ' + (u.email || '-') + '</span>',
+                    '</div>',
+                    '</div>'
+                ].join('');
+                
+                $grid.append(card);
+            });
+        }
+        
+        /* 加载更多用户 */
+        function loadMoreUsers() {
+            if (!isLoading && hasMore) {
+                loadUsersAjax();
+            }
+        }
+        
+    </script>
+</body>
+</html>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 9da01ab4..738e9824 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -119,4 +119,35 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
-}
\ No newline at end of file
+
+    /**
+     * 部门相关常量
+     */
+    public static class Dept
+    {
+        /**
+         * 全部数据权限
+         */
+        public static final String DATA_SCOPE_ALL = "1";
+
+        /**
+         * 自定数据权限
+         */
+        public static final String DATA_SCOPE_CUSTOM = "2";
+
+        /**
+         * 部门数据权限
+         */
+        public static final String DATA_SCOPE_DEPT = "3";
+
+        /**
+         * 部门及以下数据权限
+         */
+        public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+        /**
+         * 仅本人数据权限
+         */
+        public static final String DATA_SCOPE_SELF = "5";
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 74803511..901a3ef9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -7,6 +7,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.context.PermissionContextHolder;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -25,31 +26,6 @@ import com.ruoyi.common.utils.StringUtils;
 @Component
 public class DataScopeAspect
 {
-    /**
-     * 全部数据权限
-     */
-    public static final String DATA_SCOPE_ALL = "1";
-
-    /**
-     * 自定数据权限
-     */
-    public static final String DATA_SCOPE_CUSTOM = "2";
-
-    /**
-     * 部门数据权限
-     */
-    public static final String DATA_SCOPE_DEPT = "3";
-
-    /**
-     * 部门及以下数据权限
-     */
-    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
-    /**
-     * 仅本人数据权限
-     */
-    public static final String DATA_SCOPE_SELF = "5";
-
     /**
      * 数据权限过滤关键字
      */
@@ -92,7 +68,7 @@ public class DataScopeAspect
         List<String> conditions = new ArrayList<String>();
         List<String> scopeCustomIds = new ArrayList<String>();
         user.getRoles().forEach(role -> {
-            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
+            if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
             {
                 scopeCustomIds.add(Convert.toStr(role.getRoleId()));
             }
@@ -109,13 +85,13 @@ public class DataScopeAspect
             {
                 continue;
             }
-            if (DATA_SCOPE_ALL.equals(dataScope))
+            if (Constants.Dept.DATA_SCOPE_ALL.equals(dataScope))
             {
                 sqlString = new StringBuilder();
                 conditions.add(dataScope);
                 break;
             }
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(dataScope))
             {
                 if (scopeCustomIds.size() > 1)
                 {
@@ -127,15 +103,15 @@ public class DataScopeAspect
                     sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
                 }
             }
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_DEPT.equals(dataScope))
             {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
             }
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
             {
                 sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
             }
-            else if (DATA_SCOPE_SELF.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_SELF.equals(dataScope))
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 70742230..aec226d9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <sql id="selectRoleVo">
-		select r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.remark 
+		select r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.create_by, r.update_by, r.update_time, r.remark 
         from sys_role r
 	</sql>
 	
