From afaec151298b9a677e75176d00d7daa82058335e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 15 Jan 2025 17:19:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E4=BF=AE=E5=A4=8DactiveName?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E4=BB=A3=E5=8A=9E=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hz/pm/api/common/util/DingTalkMsgClient.java | 3 ++- .../hz/pm/api/scheduler/listener/UserTaskCreateOrFinishListener.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DingTalkMsgClient.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DingTalkMsgClient.java index 87144e2..f58886c 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DingTalkMsgClient.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DingTalkMsgClient.java @@ -1,5 +1,6 @@ package com.hz.pm.api.common.util; +import cn.hutool.core.util.ObjUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -45,7 +46,7 @@ public class DingTalkMsgClient { .append("\n### 待办或提醒内容\n") .append(content) .append("\n### 拓展参数\n") - .append(JSONUtil.toJsonStr(extraParam)); + .append(extraParam == null ? "暂无" : JSONUtil.toJsonStr(extraParam)); markdown.setText(JSONUtil.toJsonStr(msgObj)); msg.setMarkdown(markdown); msg.setMsgtype("markdown"); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/UserTaskCreateOrFinishListener.java b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/UserTaskCreateOrFinishListener.java index 2f5a0b8..36a02b3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/UserTaskCreateOrFinishListener.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/UserTaskCreateOrFinishListener.java @@ -288,6 +288,7 @@ public class UserTaskCreateOrFinishListener { .path(nextStep.getPagePath()) .userName(userFullInfo.getRealName()) .userId(createBy) + .activeName(nextStep.getActiveName()) .build(); String bizId; if (isBidAudit) {