From 7a9f9f26ed90c33190382645d0851490ce94424b Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 10:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index 9ccafcb..08fda60 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -116,14 +116,14 @@
if(StringUtils.isNotBlank(result)){
TypeReference typeReference =
new TypeReference<ERPApiResponse<PageData<ErpUserListResponse>>>(){};
- ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
+ ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null && response.getData()!=null && response.getData().getRecords()!=null){
list.addAll(response.getData().getRecords());
if(pageSize*page < response.getData().getTotal() ){
- hasLast =false;//杩樻湁涓嬩竴椤�
+ hasLast =true;//杩樻湁涓嬩竴椤�
}
- page++;
}
+ page++;
}
}
}catch (Exception e){
--
Gitblit v1.9.3