From c90da6806e645ee5a362c0952a3937eafd866b88 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Mar 2024 14:33:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B2=A1=E6=9C=89projectId=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E9=80=81OA=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiwork/service/impl/HiworkTodoServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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())