diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 08fe0a75a..c2faae344 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -19,6 +19,8 @@ import org.nl.system.service.menu.dao.mapper.SysMenuMapper; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.role.dao.SysRole; import org.nl.system.service.role.dao.mapper.SysRoleMapper; +import org.nl.system.service.user.dao.SysUser; +import org.nl.system.service.user.dao.mapper.SysUserMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -39,6 +41,7 @@ import java.util.*; public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService { private final SysRoleMapper roleMapper; + private final SysUserMapper userMapper; private final SysMenuMapper sysMenuMapper; @@ -130,7 +133,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl public List getPermissionList(JSONObject userDto) { List permission = new LinkedList<>(); // 查看是否为管理员 - permission.add("admin"); + String currentUserId = SecurityUtils.getCurrentUserId(); + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper().eq(SysUser::getUserId, currentUserId)); + if ( ObjectUtil.isNotEmpty(sysUser.getIsAdmin()) && sysUser.getIsAdmin()) permission.add("admin"); permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("userId"))); return permission; } diff --git a/lms/nladmin-ui/src/components/Permission/permission.js b/lms/nladmin-ui/src/components/Permission/permission.js index ce66d1150..0cc1f8714 100644 --- a/lms/nladmin-ui/src/components/Permission/permission.js +++ b/lms/nladmin-ui/src/components/Permission/permission.js @@ -1,7 +1,7 @@ import store from '@/store' export default { - inserted(el, binding, vnode) { + inserted(el, binding) { const { value } = binding const roles = store.getters && store.getters.roles if (value && value instanceof Array && value.length > 0) { @@ -15,7 +15,7 @@ export default { el.parentNode && el.parentNode.removeChild(el) } } else { - // throw new Error(`使用方式: v-permission="['admin','editor']"`) + throw new Error(`使用方式: v-permission="['admin','editor']"`) } } }