菜单权限表修改

business-service/src/main/resources/mapper/service/BaseUserMapper.xml

@@ -72,7 +72,7 @@
         from sys_user
     </select>
     <select id="getRoleName" resultType="java.lang.String" parameterType="java.lang.String">
-        SELECT  r.role_name FROM `sys_user` u JOIN sys_user_role ur ON u.id=ur.user_id JOIN sys_role r 
+        SELECT  r.role_key FROM `sys_user` u JOIN sys_user_role ur ON u.id=ur.user_id JOIN sys_role r 
          ON ur.role_id=r.role_id WHERE u.user_id=#{userId}
     </select>
     <select id="getUserById" resultType="com.ozs.service.entity.BaseUser">

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -204,7 +204,7 @@ public class BaseCameraManagementController extends BaseController {
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
-        List<String> roleName = baseUserService.getRoleName(getUserId());
+        List<String> roleKey = baseUserService.getRoleName(getUserId());
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -221,9 +221,9 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
-                if (roleName.size() > 0) {
-                    for (String s : roleName) {
-                        if ("超级管理员".equals(s)) {
+                if (roleKey.size() > 0) {
+                    for (String s : roleKey) {
+                        if ("admin".equals(s)) {
                             o.setIsStartRecording(1);
                         }
                     }

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

@@ -121,7 +121,7 @@ public class SysRoleController extends BaseController
     {
 //        roleService.checkRoleDataScope(roleId);
         SysRole sysRole = roleService.selectRoleById(roleId);
-        if (sysRole.getRoleName().equals(("超级管理员"))){
+        if (sysRole.getRoleKey().equals(("admin"))){
             List<SysMenu> list = menuService.list();
             List<Long> collect = list.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
             Long[] strArr = collect.toArray(new Long[collect.size()]);