Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -17,6 +17,7 @@
package org.springblade.flow.business.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
@@ -25,6 +26,7 @@
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
@@ -306,7 +308,6 @@
            flow.setBusinessTable(businessKey[0]);
            flow.setBusinessId(businessKey[1]);
         }

         FlowProcess processDefinition = FlowCache.getProcessDefinition(task.getProcessDefinitionId());
         flow.setCategory(processDefinition.getCategory());
         flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));