From 7458288ffad815780b146043935e8b1fbe2d71c6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Apr 2024 15:55:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hiwork/service/impl/SendMessageServiceImpl.java | 13 ++++++++-----
 .../service/impl/EsRevisionServiceImpl.java         |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
index 81bc47be..dbaa563d 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.docking.hiwork.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.dto.message.SendMessageDTO;
 import com.jero.common.api.vo.SendMessageAPI;
@@ -82,11 +83,13 @@ public class SendMessageServiceImpl implements SendMessageAPI {
             }
 
             List<String> typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(","));
-            if (openPage.contains("/workCenter/processCenter/processCenter")) {
-                if (openPage.contains("?")) {
-                    openPage = openPage + "&activeTab=TodoList";
-                } else {
-                    openPage = openPage + "?activeTab=TodoList";
+            if (StrUtil.isNotBlank(openPage)) {
+                if (openPage.contains("/workCenter/processCenter/processCenter")) {
+                    if (openPage.contains("?")) {
+                        openPage = openPage + "&activeTab=TodoList";
+                    } else {
+                        openPage = openPage + "?activeTab=TodoList";
+                    }
                 }
             }
             String finalOpenType = openType;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index df6f1298..a2ac59af 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -870,7 +870,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 msg.append("理由为：").append(advice.getReason()).append("；");
             }
             // 去除最后一个分号
-            msg.deleteCharAt(msg.length() - 1);
+            if (StrUtil.isNotBlank(msg)) {
+                msg.deleteCharAt(msg.length() - 1);
+            }
             sendMap.put("msg", msg.toString());
             sendMessageDTO.setMap(sendMap);
             sendMessageAPI.sendMessage(sendMessageDTO);