From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
index eb76c12..4f3cac3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
@@ -96,8 +96,9 @@
         if (Objects.isNull(roleId)) {
             throw new GunsException(BizExceptionEnum.REQUEST_NULL);
         }
+        Role role = roleService.getById(roleId);
         model.addAttribute("roleId", roleId);
-        model.addAttribute("roleName", ConstantFactory.me().getSingleRoleName(roleId));
+        model.addAttribute("roleName", role.getName());
         return PREFIX + "/role_assign.html";
     }
 

--
Gitblit v1.7.1