[FEAT] 移除「商品狀態」冗餘模組、優化麵包屑導航與完善帳號角色過濾邏輯
All checks were successful
star-cloud-deploy-demo / deploy-demo (push) Successful in 46s
All checks were successful
star-cloud-deploy-demo / deploy-demo (push) Successful in 46s
This commit is contained in:
@@ -743,13 +743,15 @@ $roleSelectConfig = [
|
||||
get filteredRoles() {
|
||||
const companyId = this.currentUser.company_id;
|
||||
if (!companyId || companyId.toString().trim() === '') {
|
||||
// 系統管理層級:僅顯示全域角色 (company_id 為空)
|
||||
return this.allRoles.filter(r => !r.company_id || r.company_id.toString().trim() === '');
|
||||
} else {
|
||||
let companyRoles = this.allRoles.filter(r => r.company_id == companyId);
|
||||
if (companyRoles.length > 0) {
|
||||
return companyRoles;
|
||||
} else {
|
||||
return this.allRoles.filter(r => !r.company_id || r.company_id.toString().trim() === '');
|
||||
// 租戶層級 fallback:顯示全域角色但明確排除 super-admin
|
||||
return this.allRoles.filter(r => (!r.company_id || r.company_id.toString().trim() === '') && r.name !== 'super-admin');
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -763,7 +765,8 @@ $roleSelectConfig = [
|
||||
roles = this.allRoles.filter(r => !r.company_id || r.company_id.toString().trim() === '');
|
||||
} else {
|
||||
let companyRoles = this.allRoles.filter(r => r.company_id == initialCompanyId);
|
||||
roles = companyRoles.length > 0 ? companyRoles : this.allRoles.filter(r => !r.company_id || r.company_id.toString().trim() === '');
|
||||
// 這裡也要同步排除 super-admin
|
||||
roles = companyRoles.length > 0 ? companyRoles : this.allRoles.filter(r => (!r.company_id || r.company_id.toString().trim() === '') && r.name !== 'super-admin');
|
||||
}
|
||||
|
||||
if (roles.length > 0) {
|
||||
|
||||
Reference in New Issue
Block a user