From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
index 2462352..965dd7a 100755
--- a/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
@@ -98,7 +98,7 @@
query.orderByTaskCreateTime().desc();
List<Task> list = null;
if (user.getPage() >= 1) {
- user.setPage(user.getPage() - 1);
+ user.setPage((user.getPage() - 1) * user.getRow());
}
if (user.getPage() != PageDto.DEFAULT_PAGE) {
list = query.listPage(user.getPage(), user.getRow());
@@ -260,7 +260,6 @@
taskBusinessKeyMap.put(business_key, task.getId());
}
- //鏌ヨ 鎶曡瘔淇℃伅
PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
purchaseApplyDto.setStoreId(user.getStoreId());
purchaseApplyDto.setApplyOrderIds(applyOrderIds.toArray(new String[applyOrderIds.size()]));
--
Gitblit v1.8.0