#

luxiaotao1123

2024-02-13 52a6d76d9a6c1c43f824b2aa4d2572478c49f7a0

#

 zy-asrs-flow/src/pages/system/role/index.jsx

@@ -112,6 +112,11 @@
            hideInSearch: true,
        },
        {
            title: '姓名',
            dataIndex: 'name',
            valueType: 'text',
        },
        {
            title: <FormattedMessage id="monitor.logininfor.user_name" defaultMessage="用户账号" />,
            dataIndex: 'userName',
            valueType: 'text',
@@ -259,6 +264,7 @@
                        </Button>,
                    ]}
                    request={(params) => {
                        console.log(params);
                        request('/api/role/page', {
                            method: 'POST',
                            headers: {
@@ -268,7 +274,7 @@
                        }).then((res) => {
                            if (res.code === 200) {
                                const result = {
                                    data: res.rows,
                                    data: res.records,
                                    total: res.total,
                                    success: true,
                                };

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java

@@ -14,7 +14,7 @@
    private static final long serialVersionUID = 1L;

    @TableField(exist = false)
    private Integer pageIdx;
    private Integer current;

    @TableField(exist = false)
    private Integer pageSize;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java

@@ -41,8 +41,8 @@
        this.where = where;
        this.isToUnderlineCase = isToUnderlineCase;
        if (where != null) {
            if (where.getPageIdx() != null) {
                setCurrent(where.getPageIdx());
            if (where.getCurrent() != null) {
                setCurrent(where.getCurrent());
            }
            if (where.getPageSize() != null) {
                setSize(where.getPageSize());