From 8b9af5358c8d1d432108a2f04e2ce9b41ad7325b Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: Thu, 18 Jan 2024 18:04:18 +0800
Subject: [PATCH] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=20=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/workflow/service/impl/ActModelServiceImpl.java | 3 +--
 .../main/java/org/dromara/workflow/utils/WorkflowUtils.java    | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index 1c0ea8c6b..290a0ebfe 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -238,7 +238,6 @@ public class ActModelServiceImpl implements IActModelService {
             });
             model.setKey(key);
             repositoryService.saveModel(model);
-            // 解决设计器选择设置流程发起人设置变量有问题
             JsonNode jsonNode = objectMapper.readTree(values.getFirst("json_xml"));
             // 校验流程标识
             String processId = jsonNode.get("properties").get("process_id").textValue();
@@ -382,7 +381,7 @@ public class ActModelServiceImpl implements IActModelService {
     public ResultListDataRepresentation getUsers(String filter) {
 
         LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(org.dromara.common.core.utils.StringUtils.isNotBlank(filter), SysUser::getNickName, filter);
+        wrapper.like(StringUtils.isNotBlank(filter), SysUser::getNickName, filter);
         List<SysUser> sysUsers = sysUserMapper.selectList(wrapper);
         List<UserRepresentation> userRepresentations = new ArrayList<>();
         for (SysUser sysUser : sysUsers) {
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index d73e852ff..3cd72eb75 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -322,6 +322,9 @@ public class WorkflowUtils {
      * @param businessKey 业务id
      */
     public static void setProcessInstanceVo(Object obj, String businessKey) {
+        if (StringUtils.isBlank(businessKey)) {
+            return;
+        }
         ActHiProcinst actHiProcinst = I_ACT_HI_PROCINST_SERVICE.selectByBusinessKey(businessKey);
         if (actHiProcinst == null) {
             ProcessInstanceVo processInstanceVo = new ProcessInstanceVo();