From b59fc5522771bba6b5cae1ff7f7f0a47fd3f8584 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 e4fa49f..a3eba1b 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
@@ -46,7 +46,7 @@
ERPApiResponse<PageData<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null && response.getData()!=null&& response.getData().getRecords()!=null){
list.addAll(response.getData().getRecords());
- if(100*pageSize < response.getData().getTotal() ){
+ if(page*pageSize < response.getData().getTotal() ){
hasLast =true;//杩樻湁涓嬩竴椤�
}
page++;
@@ -81,7 +81,7 @@
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(100*pageSize < response.getData().getTotal() ){
+ if(pageSize*page < response.getData().getTotal() ){
hasLast =true;//杩樻湁涓嬩竴椤�
}
page++;
@@ -99,14 +99,25 @@
* @return
*/
public static ApproveInfoResponse submitApprove(String url, ApproveAddRequest param){
+ System.out.println(JSONObject.toJSONString(param));
String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
if(StringUtils.isNotBlank(result)){
+// TypeReference typeReference =
+// new TypeReference<ERPApiResponse<ApproveInfoResponse>>(){};
+// ERPApiResponse<ApproveInfoResponse> response = JSONObject.parseObject(result, typeReference.getType());
+// if(response!=null && response.isSuccess()){
+// return response.getData();
+// }
TypeReference typeReference =
- new TypeReference<ERPApiResponse<ApproveInfoResponse>>(){};
- ERPApiResponse<ApproveInfoResponse> response = JSONObject.parseObject(result, typeReference.getType());
+ new TypeReference<ERPApiResponse<String>>(){};
+ ERPApiResponse<String> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null && response.isSuccess()){
- return response.getData();
+ ApproveInfoResponse approveInfoResponse = new ApproveInfoResponse();
+ approveInfoResponse.setId(response.getData());
+ return approveInfoResponse;
}
+
+
}
return null;
}
--
Gitblit v1.9.3