Skip to content

Commit 0b31b0e

Browse files
committed
Fixed user query
1 parent b804e61 commit 0b31b0e

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

src/pages/User/UserList.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { PureComponent } from 'react';
22
import { connect } from 'dva';
33
import { Row, Col, Card, Form, Input, Button, Table, Modal, Badge, Radio } from 'antd';
4-
import PageHeaderLayout from '../../layouts/PageHeaderLayout';
54
import PButton from '@/components/PermButton';
5+
import PageHeaderLayout from '../../layouts/PageHeaderLayout';
66
import UserCard from './UserCard';
77
import RoleSelect from './RoleSelect';
88
import { formatDate } from '../../utils/utils';
@@ -131,16 +131,13 @@ class UserList extends PureComponent {
131131
return;
132132
}
133133

134-
let roleIDs = '';
135-
if (values.role_ids) {
136-
roleIDs = values.role_ids.map(v => v.role_id).join(',');
134+
const formData = { ...values };
135+
if (formData.roleIDs) {
136+
formData.roleIDs = formData.roleIDs.map(v => v.role_id).join(',');
137137
}
138138
this.dispatch({
139139
type: 'user/fetch',
140-
search: {
141-
...values,
142-
role_ids: roleIDs,
143-
},
140+
search: formData,
144141
pagination: {},
145142
});
146143
this.clearSelectRows();
@@ -180,16 +177,16 @@ class UserList extends PureComponent {
180177
<Row gutter={16}>
181178
<Col span={8}>
182179
<Form.Item label="用户名">
183-
{getFieldDecorator('user_name')(<Input placeholder="请输入" />)}
180+
{getFieldDecorator('userName')(<Input placeholder="请输入" />)}
184181
</Form.Item>
185182
</Col>
186183
<Col span={8}>
187184
<Form.Item label="真实姓名">
188-
{getFieldDecorator('real_name')(<Input placeholder="请输入" />)}
185+
{getFieldDecorator('realName')(<Input placeholder="请输入" />)}
189186
</Form.Item>
190187
</Col>
191188
<Col span={8}>
192-
<Form.Item label="所属角色">{getFieldDecorator('role_ids')(<RoleSelect />)}</Form.Item>
189+
<Form.Item label="所属角色">{getFieldDecorator('roleIDs')(<RoleSelect />)}</Form.Item>
193190
</Col>
194191
</Row>
195192
<Row gutter={16}>

0 commit comments

Comments
 (0)