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 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