diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index e53e7aa..d784464 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -96,7 +96,7 @@ public class SysRegisterService String level = registerBody.getUserLevel(); if ("1".equals(level)) { - roleIds[0] = 1L; // 管理员角色ID + roleIds[0] = 101L; // 管理员角色ID } else if ("2".equals(level)) { roleIds[0] = 100L; // 主持人角色ID } else { diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue index 25b46c6..09fe537 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -610,10 +610,12 @@ export default { isAdmin() { const roles = this.$store.getters.roles || []; const id = this.$store.getters.id; + const userLevel = String(this.$store.getters.userLevel); return ( - roles.includes('admin') || - String(id) === '1' || - (Array.isArray(roles) && roles.some(r => String(r).toLowerCase() === 'admin')) + id === '1' || //系统超级管理员 ID + userLevel === '1' || //数据库 user_level 字段为管理员 + roles.includes('admin') || //拥有超级管理员角色 + roles.includes('manager') //拥有你新定义的“业务管理员”角色 ); }, canSetKTime() { @@ -1246,6 +1248,7 @@ export default { openKTimeSetDialog() { console.log("当前登录 ID (myId):", this.$store.getters.id); console.log("当前房间 ownerId:", this.roomDetail ? this.roomDetail.ownerId : '无房间信息'); + console.log("当前房间 userLevel:", this.$store.getters.userLevel); console.log("当前角色 roles:", this.$store.getters.roles); if (!this.canSetKTime) { this.$message.info('仅房主或管理员可设定或修改 K 时'); diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 8c502e4..f762d77 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -154,9 +154,9 @@ v-model="form.role" class="form-select" > - + - + @@ -252,7 +252,8 @@ export default { // 2. 转换角色值为后端数据库期望的数字格式 const roleMap = { - 'admin': '1', + 'manager': '1', + 'admin':'1', 'host': '2', 'user': '3' };