xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-18 01:06:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复 流程重新提交报错问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2025-08-19 17:48:30 +08:00
parent 6742dcb33e
commit d98d11ae2d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceBizExtServiceImpl.java
View File

@ -39,7 +39,7 @@ public class FlwInstanceBizExtServiceImpl implements IFlwInstanceBizExtService {
.eq(FlowInstanceBizExt::getInstanceId, bo.getInstanceId())); .eq(FlowInstanceBizExt::getInstanceId, bo.getInstanceId()));
if (flowInstanceBizExt != null) { if (flowInstanceBizExt != null) {
flowInstanceBizExt.setBusinessTitle(convert.getBusinessTitle()); flowInstanceBizExt.setBusinessTitle(convert.getBusinessTitle());
return baseMapper.insertOrUpdate(convert); return baseMapper.insertOrUpdate(flowInstanceBizExt);
} }
return baseMapper.insertOrUpdate(convert); return baseMapper.insertOrUpdate(convert);
} }

11
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -83,7 +83,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
private final IFlwTaskAssigneeService flwTaskAssigneeService; private final IFlwTaskAssigneeService flwTaskAssigneeService;
private final IFlwCommonService flwCommonService; private final IFlwCommonService flwCommonService;
private final IFlwNodeExtService flwNodeExtService; private final IFlwNodeExtService flwNodeExtService;
private final FlowDefinitionMapper flowDefinitionMapper;
private final IFlwInstanceBizExtService flowInstanceBizExtService; private final IFlwInstanceBizExtService flowInstanceBizExtService;
/** /**
@ -108,6 +107,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
variables.put(BUSINESS_ID, businessId); variables.put(BUSINESS_ID, businessId);
FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class) FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class)
.eq(FlowInstance::getBusinessId, businessId)); .eq(FlowInstance::getBusinessId, businessId));
FlowInstanceBizExtBo extBo = startProcessBo.getFlowInstanceBizExtBo();
if (ObjectUtil.isEmpty(extBo)) {
extBo = new FlowInstanceBizExtBo();
startProcessBo.setFlowInstanceBizExtBo(extBo);
}
if (ObjectUtil.isNotNull(flowInstance)) { if (ObjectUtil.isNotNull(flowInstance)) {
BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus()); BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus());
List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId())); List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId()));
@ -120,12 +124,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
buildFlowInstanceBizExt(flowInstance, startProcessBo.getFlowInstanceBizExtBo()); buildFlowInstanceBizExt(flowInstance, startProcessBo.getFlowInstanceBizExtBo());
return dto; return dto;
} }
FlowInstanceBizExtBo extBo = startProcessBo.getFlowInstanceBizExtBo();
String businessCode; String businessCode;
if (ObjectUtil.isEmpty(extBo)) {
extBo = new FlowInstanceBizExtBo();
startProcessBo.setFlowInstanceBizExtBo(extBo);
}
// 生成业务编号 // 生成业务编号
if (StringUtils.isBlank(extBo.getBusinessCode())) { if (StringUtils.isBlank(extBo.getBusinessCode())) {
//todo 按照自己业务自行修改 //todo 按照自己业务自行修改