admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 修复创建任务，模型租户判断

Browse Source
This commit is contained in:
songgaoshuai 2024-03-07 13:21:07 +08:00
parent acc7f3dfe5
commit 079f90766f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
View File

@ -107,7 +107,9 @@ public class ActModelServiceImpl implements IActModelService {
model.setVersion(version); model.setVersion(version);
model.setCategory(categoryCode); model.setCategory(categoryCode);
model.setMetaInfo(description); model.setMetaInfo(description);
model.setTenantId(TenantHelper.getTenantId()); if (TenantHelper.isEnable()) {
model.setTenantId(TenantHelper.getTenantId());
}
//保存初始化的模型基本信息数据 //保存初始化的模型基本信息数据
repositoryService.saveModel(model); repositoryService.saveModel(model);
repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml)); repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml));

9
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
View File

@ -70,7 +70,6 @@ public class WorkflowUtils {
task = (TaskEntity) PROCESS_ENGINE.getTaskService().newTask(); task = (TaskEntity) PROCESS_ENGINE.getTaskService().newTask();
task.setCategory(currentTask.getCategory()); task.setCategory(currentTask.getCategory());
task.setDescription(currentTask.getDescription()); task.setDescription(currentTask.getDescription());
task.setTenantId(currentTask.getTenantId());
task.setAssignee(currentTask.getAssignee()); task.setAssignee(currentTask.getAssignee());
task.setName(currentTask.getName()); task.setName(currentTask.getName());
task.setProcessDefinitionId(currentTask.getProcessDefinitionId()); task.setProcessDefinitionId(currentTask.getProcessDefinitionId());
@ -78,7 +77,9 @@ public class WorkflowUtils {
task.setTaskDefinitionKey(currentTask.getTaskDefinitionKey()); task.setTaskDefinitionKey(currentTask.getTaskDefinitionKey());
task.setPriority(currentTask.getPriority()); task.setPriority(currentTask.getPriority());
task.setCreateTime(new Date()); task.setCreateTime(new Date());
task.setTenantId(TenantHelper.getTenantId()); if (TenantHelper.isEnable()) {
task.setTenantId(TenantHelper.getTenantId());
}
PROCESS_ENGINE.getTaskService().saveTask(task); PROCESS_ENGINE.getTaskService().saveTask(task);
} }
if (ObjectUtil.isNotNull(task)) { if (ObjectUtil.isNotNull(task)) {
@ -118,7 +119,9 @@ public class WorkflowUtils {
actHiTaskinst.setProcDefId(processDefinitionId); actHiTaskinst.setProcDefId(processDefinitionId);
actHiTaskinst.setProcInstId(processInstanceId); actHiTaskinst.setProcInstId(processInstanceId);
actHiTaskinst.setScopeType(TaskStatusEnum.COPY.getStatus()); actHiTaskinst.setScopeType(TaskStatusEnum.COPY.getStatus());
actHiTaskinst.setTenantId(TenantHelper.getTenantId()); if (TenantHelper.isEnable()) {
actHiTaskinst.setTenantId(TenantHelper.getTenantId());
}
LambdaUpdateWrapper<ActHiTaskinst> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<ActHiTaskinst> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(ActHiTaskinst::getId, taskIds); updateWrapper.in(ActHiTaskinst::getId, taskIds);
ACT_HI_TASKINST_MAPPER.update(actHiTaskinst, updateWrapper); ACT_HI_TASKINST_MAPPER.update(actHiTaskinst, updateWrapper);