From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/common/bean/PageBean.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..99193f8 100644
--- a/src/main/java/com/moral/common/bean/PageBean.java
+++ b/src/main/java/com/moral/common/bean/PageBean.java
@@ -3,9 +3,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-
import com.github.pagehelper.Page;
-
import lombok.Data;
/**
@@ -24,7 +22,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 +41,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