Browse Source

修复业务管理员存在及相关权限判断

mh
menghao 2 months ago
parent
commit
70a484e37e
  1. 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
  2. 9
      ruoyi-ui/src/views/childRoom/index.vue
  3. 7
      ruoyi-ui/src/views/login.vue

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@ -96,7 +96,7 @@ public class SysRegisterService
String level = registerBody.getUserLevel(); String level = registerBody.getUserLevel();
if ("1".equals(level)) { if ("1".equals(level)) {
roleIds[0] = 1L; // 管理员角色ID roleIds[0] = 101L; // 管理员角色ID
} else if ("2".equals(level)) { } else if ("2".equals(level)) {
roleIds[0] = 100L; // 主持人角色ID roleIds[0] = 100L; // 主持人角色ID
} else { } else {

9
ruoyi-ui/src/views/childRoom/index.vue

@ -542,10 +542,12 @@ export default {
isAdmin() { isAdmin() {
const roles = this.$store.getters.roles || []; const roles = this.$store.getters.roles || [];
const id = this.$store.getters.id; const id = this.$store.getters.id;
const userLevel = String(this.$store.getters.userLevel);
return ( return (
roles.includes('admin') || id === '1' || // ID
String(id) === '1' || userLevel === '1' || // user_level
(Array.isArray(roles) && roles.some(r => String(r).toLowerCase() === 'admin')) roles.includes('admin') || //
roles.includes('manager') //
); );
}, },
canSetKTime() { canSetKTime() {
@ -1127,6 +1129,7 @@ export default {
openKTimeSetDialog() { openKTimeSetDialog() {
console.log("当前登录 ID (myId):", this.$store.getters.id); console.log("当前登录 ID (myId):", this.$store.getters.id);
console.log("当前房间 ownerId:", this.roomDetail ? this.roomDetail.ownerId : '无房间信息'); console.log("当前房间 ownerId:", this.roomDetail ? this.roomDetail.ownerId : '无房间信息');
console.log("当前房间 userLevel:", this.$store.getters.userLevel);
console.log("当前角色 roles:", this.$store.getters.roles); console.log("当前角色 roles:", this.$store.getters.roles);
if (!this.canSetKTime) { if (!this.canSetKTime) {
this.$message.info('仅房主或管理员可设定或修改 K 时'); this.$message.info('仅房主或管理员可设定或修改 K 时');

7
ruoyi-ui/src/views/login.vue

@ -154,9 +154,9 @@
v-model="form.role" v-model="form.role"
class="form-select" class="form-select"
> >
<option value="user">普通用户</option> <option value="manager">管理员</option>
<option value="host">主持人</option> <option value="host">主持人</option>
<option value="admin">管理员</option> <option value="user">普通用户</option>
</select> </select>
</div> </div>
@ -252,7 +252,8 @@ export default {
// 2. // 2.
const roleMap = { const roleMap = {
'admin': '1', 'manager': '1',
'admin':'1',
'host': '2', 'host': '2',
'user': '3' 'user': '3'
}; };

Loading…
Cancel
Save