Commit 5d0eb130 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/develop' into develop

parents c781b601 f27573d9
...@@ -151,7 +151,12 @@ public class FascUtil { ...@@ -151,7 +151,12 @@ public class FascUtil {
// 超过1页的循环查询 // 超过1页的循环查询
if (listPageCount > 1) { if (listPageCount > 1) {
for (int i = 2; i <= listPageCount; i++) { for (int i = 2; i <= listPageCount; i++) {
getSignTemplateListReq = new GetSignTemplateListReq();
getSignTemplateListReq.setOwnerId(ownerId);
getSignTemplateListReq.setListFilter(signTemplateListFilterInfo);
getSignTemplateListReq.setAccessToken(accessToken);
getSignTemplateListReq.setListPageNo(i); getSignTemplateListReq.setListPageNo(i);
getSignTemplateListReq.setListPageSize(100);
pushLog = new TFascPushLog(); pushLog = new TFascPushLog();
pushLog.setTransReferenceId(company.getOpenId()); pushLog.setTransReferenceId(company.getOpenId());
...@@ -168,7 +173,8 @@ public class FascUtil { ...@@ -168,7 +173,8 @@ public class FascUtil {
pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING); pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING);
tFascPushLogService.updateById(pushLog); tFascPushLogService.updateById(pushLog);
if (res.getData().getSignTemplates() != null && !res.getData().getSignTemplates().isEmpty()) { if (res.isSuccess() && res.getData() != null && res.getData().getSignTemplates() != null
&& !res.getData().getSignTemplates().isEmpty()) {
list.addAll(res.getData().getSignTemplates()); list.addAll(res.getData().getSignTemplates());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment