diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java index c1f65ee9..21d59b3d 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java @@ -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())