Merge remote-tracking branch 'origin/master'

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

@@ -124,7 +124,7 @@ public class SysUserController extends BaseController {
                 }
                 if (SysUser.isAdmin(o.getId())) {
                     List<SysRole> roles = roleService.selectRoleAll();
-                    List<SysRole> roLe = roles.stream().filter(r -> r.getRoleName().equals("超级管理员")).collect(Collectors.toList());
+                    List<SysRole> roLe = roles.stream().filter(r -> r.getRoleKey().equals("admin")).collect(Collectors.toList());
                     longs.add(roLe.get(0).getRoleId());
                 } else {
                     longs = iSysRoleService.selectRoleListByUserId(o.getId());
@@ -149,7 +149,7 @@ public class SysUserController extends BaseController {
             StringBuilder stringBuilder = new StringBuilder();
             if (SysUser.isAdmin(sysUser.getId())) {
                 List<SysRole> roles = roleService.selectRoleAll();
-                List<SysRole> roLe = roles.stream().filter(r -> r.getRoleName().equals("超级管理员")).collect(Collectors.toList());
+                List<SysRole> roLe = roles.stream().filter(r -> r.getRoleKey().equals("admin")).collect(Collectors.toList());
                 longs.add(roLe.get(0).getRoleId());
             } else {
                 longs = roleService.selectRoleListByUserId(sysUser.getId());
@@ -213,7 +213,7 @@ public class SysUserController extends BaseController {
             SysUser sysUser = userService.selectUserById(id);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             if (SysUser.isAdmin(id)){
-                List<SysRole> roLe = roles.stream().filter(r -> r.getRoleName().equals("超级管理员")).collect(Collectors.toList());
+                List<SysRole> roLe = roles.stream().filter(r -> r.getRoleKey().equals("admin")).collect(Collectors.toList());
                 ajax.put("roleIds", roLe.stream().map(SysRole::getRoleId).collect(Collectors.toList())); 
             }else {
                 ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));