From 70a484e37ed74c1e4a4e24943ba4cb67fe0abe63 Mon Sep 17 00:00:00 2001 From: menghao <1584479611@qq.com> Date: Fri, 6 Feb 2026 15:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=AD=98=E5=9C=A8=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/web/service/SysRegisterService.java | 2 +- ruoyi-ui/src/views/childRoom/index.vue | 9 ++++++--- ruoyi-ui/src/views/login.vue | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) 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 5f32161..4370af7 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -542,10 +542,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() { @@ -1127,6 +1129,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' };