From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
index 9f474eb..1034e13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -679,7 +679,7 @@
long counttotal = 5000;
// 绮鹃�夊簱鏁版嵁涓虹┖鏃讹紝缃戠粶杩涜鏌ヨ
- if (listQuery == null || listQuery.size() == 0) {
+ if (listQuery == null || listQuery.size() == 0||listQuery.size()<10) {
long count = qualityGoodsService.countQueryClassId(gcid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
page = page - totalPage;
--
Gitblit v1.8.0