1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -137,7 +137,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 }
                 String taskId = "";
                 // 只有待审核状态才有taskId
-                if (StringUtils.isNotBlank(tranSettlementReport1.getWorkflowId())) {
+                if (StringUtils.isNotBlank(tranSettlementReport1.getWorkflowId())&&StringUtils.isNotBlank(tranSettlementReport1.getBatchId())) {
+
                     JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(tranSettlementReport1.getWorkflowId()), tranSettlementReport1.getBatchId());
                     taskId = jsonObject.getString("taskId");
                     tranSettlementReport1.setTaskId(taskId);