fix: 没有projectId的流程发送OA待办空指针
This commit is contained in:
+8
-3
@@ -1,6 +1,7 @@
|
||||
package com.jero.modules.docking.hiwork.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
@@ -175,11 +176,15 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
||||
if(!Objects.isNull(processAll.getDueTime())){
|
||||
hiworkTodo.setDueTime(processAll.getDueTime().getTime());
|
||||
}
|
||||
hiworkTodo.setBid(processAll.getProjectId());
|
||||
String projectId = "";
|
||||
if (StrUtil.isNotBlank(processAll.getProjectId())){
|
||||
projectId = processAll.getProjectId();
|
||||
}
|
||||
hiworkTodo.setBid(projectId);
|
||||
String url = hiworkFontUrl
|
||||
//.replaceAll("&","%26")
|
||||
//.replaceAll("\\?","%3F")
|
||||
.replace("{projectId}",processAll.getProjectId())
|
||||
.replace("{projectId}",projectId)
|
||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||
.replace("{taskId}",processApprovalRecord.getTaskId())
|
||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||
@@ -191,7 +196,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
||||
String appUrl = hiworkFontAppUrl
|
||||
//.replaceAll("&","%26")
|
||||
//.replaceAll("\\?","%3F")
|
||||
.replace("{projectId}",processAll.getProjectId())
|
||||
.replace("{projectId}",projectId)
|
||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||
.replace("{taskId}",processApprovalRecord.getTaskId())
|
||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||
|
||||
Reference in New Issue
Block a user