From db92570b75243bd23c5a7412f4b951ca12c382a9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 17:11:01 +0800
Subject: [PATCH] 设备模块代码恢复
---
src/main/java/com/moral/common/bean/PageBean.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/PageBean.java b/src/main/java/com/moral/common/bean/PageBean.java
index 60900df..01a6f9f 100644
--- a/src/main/java/com/moral/common/bean/PageBean.java
+++ b/src/main/java/com/moral/common/bean/PageBean.java
@@ -24,7 +24,8 @@
private Integer pageIndex; // ���������
private Integer pageSize; // ���������������
private Integer pages; // ���������
- private String queryParams;
+ private String queryParams; //������������
+ private String orderByClause;//������������
private Integer size; // ������������������ <= pageSize������������������ArrayList���size������
/**
@@ -42,6 +43,9 @@
this.pages = page.getPages();
this.data= new ArrayList<>(list);
this.size = page.size();
+ }else{
+ this.data = list;
+ this.total = Integer.toUnsignedLong(list.size());
}
}
--
Gitblit v1.8.0