|
|
@@ -7,6 +7,8 @@ import menu_get_ids from '/@/mock/menu_get_ids.json'
|
|
|
import tool from '/@/utils/Tool';
|
|
|
import { identity } from 'lodash-es';
|
|
|
import { session } from '/@/utils/Memory';
|
|
|
+import { getAuthCache } from '/@/utils/auth';
|
|
|
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
|
|
|
|
|
|
enum Api {
|
|
|
BaseMenuUrl = '/menu',
|
|
|
@@ -182,26 +184,27 @@ export const getMenusIdsByRoleId3 = () => {
|
|
|
|
|
|
|
|
|
export const getMenusIdsByRoleId = () => {
|
|
|
-
|
|
|
+ const userInfo: any = getAuthCache(USER_INFO_KEY);
|
|
|
var p1 = new Promise((resolve, reject) => {
|
|
|
defHttp.post<Array<string>>({
|
|
|
url: Api.GetRoleMenus, params: {
|
|
|
menusId: true,
|
|
|
systemId: '1',
|
|
|
- roleIds: session.getItem("roles"),//'FB264E2A-BBEN-FB9T-9CEU-FF94AF30DB87',
|
|
|
+ roleIds: session.getItem("roles")||userInfo.info.ROLES[0].ROLE_ID,//'FB264E2A-BBEN-FB9T-9CEU-FF94AF30DB87',
|
|
|
}
|
|
|
}).then(r => {
|
|
|
resolve(r.datas.map(i => i.id))
|
|
|
})
|
|
|
})
|
|
|
var p2 = new Promise((resolve, reject) => {
|
|
|
+
|
|
|
defHttp.post<Array<string>>({
|
|
|
url: Api.GetUserMenus, params: {
|
|
|
getMenuId: true,
|
|
|
getUserConfigMenu: true,
|
|
|
systemId: "1",
|
|
|
useOneRole: true,
|
|
|
- userId: session.getItem('userId'),
|
|
|
+ userId: session.getItem('userId')||userInfo.info.EMPLOYEE.EMPLOYEE_ID,
|
|
|
}
|
|
|
}).then(r => {
|
|
|
resolve(r.datas)
|