From 52a6d76d9a6c1c43f824b2aa4d2572478c49f7a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 21:19:37 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/role/index.jsx | 8 +++++++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 7980197..905d50f 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/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,
};
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
index ed92c8f..00e0b7c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
+++ b/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;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
index d407fce..f94705f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
+++ b/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());
--
Gitblit v1.9.1