|
@@ -69,10 +69,22 @@ const UserModel: UserModelType = {
|
|
|
*getRoleList(_, { call, put }) {
|
|
|
const { payload, callback } = _;
|
|
|
|
|
|
- const r = yield call(getRoleListNew, payload);
|
|
|
+ const r = yield call(getRoleList, payload);
|
|
|
|
|
|
yield put({
|
|
|
type: 'saveRoleList',
|
|
|
+ payload: r.data.records,
|
|
|
+ });
|
|
|
+
|
|
|
+ callback();
|
|
|
+ },
|
|
|
+ *getRoleListNew(_, { call, put }) {
|
|
|
+ const { payload, callback } = _;
|
|
|
+
|
|
|
+ const r = yield call(getRoleListNew, payload);
|
|
|
+
|
|
|
+ yield put({
|
|
|
+ type: 'saveRoleListNew',
|
|
|
payload: r.data,
|
|
|
});
|
|
|
|
|
@@ -81,13 +93,19 @@ const UserModel: UserModelType = {
|
|
|
},
|
|
|
|
|
|
reducers: {
|
|
|
+ saveRoleListNew(state, action) {
|
|
|
+ console.log(action, 'action');
|
|
|
+
|
|
|
+ let newState = { ...state, roleList: action.payload || [] };
|
|
|
+ return newState;
|
|
|
+ },
|
|
|
/**
|
|
|
* @description 保存权限列表
|
|
|
*/
|
|
|
saveRoleList(state, action) {
|
|
|
console.log(action, 'action');
|
|
|
|
|
|
- let newState = { ...state, roleList: action.payload || [] };
|
|
|
+ let newState = { ...state, roleList: action.payload.slice(1) || [] };
|
|
|
return newState;
|
|
|
},
|
|
|
|