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 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 sysUsers = sysUserMapper.selectList(wrapper); List 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();