ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 没有projectId的流程发送OA待办空指针

Browse Source
This commit is contained in:
mzaxd
2024-03-15 14:33:53 +08:00
parent 72e92122b7
commit c90da6806e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
+8 -3
View File
@@ -1,6 +1,7 @@
package com.jero.modules.docking.hiwork.service.impl; package com.jero.modules.docking.hiwork.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -175,11 +176,15 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
if(!Objects.isNull(processAll.getDueTime())){ if(!Objects.isNull(processAll.getDueTime())){
hiworkTodo.setDueTime(processAll.getDueTime().getTime()); 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 String url = hiworkFontUrl
//.replaceAll("&","%26") //.replaceAll("&","%26")
//.replaceAll("\\?","%3F") //.replaceAll("\\?","%3F")
.replace("{projectId}",processAll.getProjectId()) .replace("{projectId}",projectId)
.replace("{taskName}",processApprovalRecord.getTaskName()) .replace("{taskName}",processApprovalRecord.getTaskName())
.replace("{taskId}",processApprovalRecord.getTaskId()) .replace("{taskId}",processApprovalRecord.getTaskId())
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId()) .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
@@ -191,7 +196,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
String appUrl = hiworkFontAppUrl String appUrl = hiworkFontAppUrl
//.replaceAll("&","%26") //.replaceAll("&","%26")
//.replaceAll("\\?","%3F") //.replaceAll("\\?","%3F")
.replace("{projectId}",processAll.getProjectId()) .replace("{projectId}",projectId)
.replace("{taskName}",processApprovalRecord.getTaskName()) .replace("{taskName}",processApprovalRecord.getTaskName())
.replace("{taskId}",processApprovalRecord.getTaskId()) .replace("{taskId}",processApprovalRecord.getTaskId())
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId()) .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())