修改保存角色修改

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 
@@ -14,6 +15,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.core.domain.vo.SysRoleRequestVo;
 import com.ozs.common.core.domain.vo.SysUserVo;
+import com.ozs.service.entity.BaseUser;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.system.domain.SysRoleMenu;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysMenuService;
@@ -76,6 +79,8 @@ public class SysRoleController extends BaseController
     private DataScoreUtil dataScoreUtil;
     @Autowired
     private ISysMenuService menuService;
+    @Resource
+    private BaseUserService baseUserService;
 
 //    @PreAuthorize("@ss.hasPermi('system:role:list')")
 //    @GetMapping("/list")
@@ -166,11 +171,14 @@ public class SysRoleController extends BaseController
     {
 //        roleService.checkRoleAllowed(role);
 //        roleService.checkRoleDataScope(role.getRoleId());
-        if (!ObjectUtils.isEmpty(role.getRoleKey())){
-            role.setRoleKey("admin");
-        }
-        if (!ObjectUtils.isEmpty(role.getStatus())){
-            role.setStatus("1");
+        BaseUser baseUser = baseUserService.getUser(getUserId());
+        if ("admin".equals(baseUser.getUserName())) {
+            if (!ObjectUtils.isEmpty(role.getRoleKey())) {
+                role.setRoleKey("admin");
+            }
+            if (!ObjectUtils.isEmpty(role.getStatus())) {
+                role.setStatus("1");
+            }
         }
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {