diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java index d1668e13..ab8d0051 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java @@ -61,10 +61,6 @@ public class HiworkService { queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getMessageType,1); queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getState,2); List listLawsUnifiedTodoLog = lawsUnifiedTodoLogService.list(queryLawsUnifiedTodoLog); - if(CollectionUtils.isEmpty(listLawsUnifiedTodoLog)){ - return Result.OK(); - } - - return Result.OK(); + return Result.OK(listLawsUnifiedTodoLog); } } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java index 82d8744a..cc5ac5e4 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java @@ -108,16 +108,15 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { } try { List unifiedTodoList = getHiworkTodos(unifiedTodoVOList); - String reqJsonString = JSONObject.toJSONString(unifiedTodoVOList); String jsonString = JSONObject.toJSONString(unifiedTodoList); log.info("统一待办推送入参" + jsonString); - push(ip + todoUrl,jsonString, reqJsonString, unifiedTodoList.get(0).getRequestname()); + push(ip + todoUrl,jsonString, unifiedTodoList.get(0).getRequestname()); }catch (Exception e){ log.error("统一待办推送异常",e); } } - private void push(String url, String jsonString, String reqJsonString, String title) { + private void push(String url, String jsonString, String title) { // 设置最大重试次数 int maxRetries = 3; // 当前重试次数 @@ -149,7 +148,7 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { } } lawsUnifiedTodoLog.setUrl(url); - lawsUnifiedTodoLog.setJsonStr(reqJsonString); + lawsUnifiedTodoLog.setJsonStr(jsonString); lawsUnifiedTodoLog.setMessageType(1); lawsUnifiedTodoLog.setTitle(title); if (retries == maxRetries){