Skip to content

fix: 只有超管角色可以设置超管，其他角色账户在设置角色时不显示超管角色 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seasonlaw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: 只有超管角色可以设置超管，其他角色账户在设置角色时不显示超管角色 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/components/mlSelectUser/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
import { ref, watch, onMounted, inject, nextTick, reactive, computed } from "vue";
import useCommonStore from "@/store/modules/common";
import { storeToRefs } from "pinia";
import tool from "@/utils/tool";
const { publicSetting } = storeToRefs(useCommonStore());
const api = inject("$API");
const cloneDeep = inject("$CloneDeep");
Expand Down Expand Up @@ -209,6 +210,8 @@ let tabData = ref([]);
let cutTabCode = ref("User");
// 是否树形模式（用户、部门）
const isTreeMode = computed(() => cutTabCode.value === 'User' || cutTabCode.value === 'Department');
// 判断当前用户是否是管理员
const isCurrentUserAdmin = ref(false);
// 树 props/keys（用户/部门树均为 label/id）
const treeLabelKey = computed(() => 'label');
const treeIdKey = computed(() => 'id');
Expand Down Expand Up @@ -258,6 +261,17 @@ onMounted(() => {
itemName: "jobTitle",
});
}
// 检查当前用户是否是管理员
const userInfo = tool.data.get("USER_INFO");
if (userInfo && userInfo.roles && Array.isArray(userInfo.roles)) {
// 遍历 roles 数组，检查是否包含管理员角色
isCurrentUserAdmin.value = userInfo.roles.some(r => {
const roleId = r.id || '';
const roleName = r.name || '';
return roleId.includes('00000000000000000000000000000001') ||
roleName.includes('管理员角色');
});
}
initData();
});

Expand Down Expand Up @@ -302,7 +316,15 @@ let getData = async () => {
const apiName = cutTabCode.value === 'User' ? 'getUserTreeData' : 'getDepartmentTreeData';
res = await api.common[apiName](query);
} else {
res = await api.common["get" + cutTabCode.value](param, props.filter[cutTabCode.value]);
// 如果是角色标签，且当前用户不是管理员，自动过滤掉管理员角色
let filterObj = Object.assign({}, props.filter[cutTabCode.value] || {});
if (cutTabCode.value === 'Role' && !isCurrentUserAdmin.value) {
// 合并过滤条件，排除管理员角色
filterObj = Object.assign({}, filterObj, {
filterEasySql: "roleId NOT LIKE '%00000000000000000000000000000001%'"
});
}
res = await api.common["get" + cutTabCode.value](param, filterObj);
}
if (res) {
if (isTreeMode.value) {
Expand Down