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

!689 update 删除退回任务bo关于驳回的节点的非空校验

Browse Source 
* update 删除退回任务bo关于驳回的节点的非空校验
This commit is contained in:
晓华 2025-05-26 12:50:03 +00:00 committed by 疯狂的狮子Li
parent d1889c42a3
commit 79ec850eca
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
View File

@ -43,7 +43,6 @@ public class BackProcessBo implements Serializable {
/** /**
* 驳回的节点id(目前未使用，直接驳回到申请人) * 驳回的节点id(目前未使用，直接驳回到申请人)
*/ */
@NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class)
private String nodeCode; private String nodeCode;
/** /**

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -422,15 +422,12 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
if (instance != null) { if (instance != null) {
BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus()); BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus());
} }
List<FlowTask> flowTaskList = flwTaskService.selectByInstId(bo.getId());
for (FlowTask flowTask : flowTaskList) {
FlowParams flowParams = FlowParams.build() FlowParams flowParams = FlowParams.build()
.message(bo.getComment()) .message(bo.getComment())
.flowStatus(BusinessStatusEnum.INVALID.getStatus()) .flowStatus(BusinessStatusEnum.INVALID.getStatus())
.hisStatus(TaskStatusEnum.INVALID.getStatus()) .hisStatus(TaskStatusEnum.INVALID.getStatus())
.ignore(true); .ignore(true);
taskService.termination(flowTask.getId(), flowParams); taskService.terminationByInsId(bo.getId(), flowParams);
}
return true; return true;
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);