|
@@ -2,7 +2,7 @@ import type { Effect, Reducer } from 'umi';
|
|
|
|
|
|
import { queryCurrent, query as queryUsers } from '@/services/user';
|
|
|
|
|
|
-import { getRoleList } from '@/services/role';
|
|
|
+import { getRoleList, getRoleListNew } from '@/services/role';
|
|
|
|
|
|
export type CurrentUser = {
|
|
|
avatar?: string;
|
|
@@ -69,11 +69,11 @@ const UserModel: UserModelType = {
|
|
|
*getRoleList(_, { call, put }) {
|
|
|
const { payload, callback } = _;
|
|
|
|
|
|
- const r = yield call(getRoleList, payload);
|
|
|
+ const r = yield call(getRoleListNew, payload);
|
|
|
|
|
|
yield put({
|
|
|
type: 'saveRoleList',
|
|
|
- payload: r.data.records,
|
|
|
+ payload: r.data,
|
|
|
});
|
|
|
|
|
|
callback();
|
|
@@ -85,7 +85,9 @@ const UserModel: UserModelType = {
|
|
|
* @description 保存权限列表
|
|
|
*/
|
|
|
saveRoleList(state, action) {
|
|
|
- let newState = { ...state, roleList: action.payload.slice(1) || [] };
|
|
|
+ console.log(action, 'action');
|
|
|
+
|
|
|
+ let newState = { ...state, roleList: action.payload || [] };
|
|
|
return newState;
|
|
|
},
|
|
|
|