dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-10-14 14:10:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
疯狂的狮子Li
2025-05-27 17:17:03 +08:00
parent f34a92c6a4
commit 90b508eaf3
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
package org.dromara.workflow.domain.bo; package org.dromara.workflow.domain.bo;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
@@ -43,7 +42,6 @@ public class BackProcessBo implements Serializable {
/** /**
* 驳回的节点id(目前未使用，直接驳回到申请人) * 驳回的节点id(目前未使用，直接驳回到申请人)
*/ */
@NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class)
private String nodeCode; private String nodeCode;
/** /**

15
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()); FlowParams flowParams = FlowParams.build()
for (FlowTask flowTask : flowTaskList) { .message(bo.getComment())
FlowParams flowParams = FlowParams.build() .flowStatus(BusinessStatusEnum.INVALID.getStatus())
.message(bo.getComment()) .hisStatus(TaskStatusEnum.INVALID.getStatus())
.flowStatus(BusinessStatusEnum.INVALID.getStatus()) .ignore(true);
.hisStatus(TaskStatusEnum.INVALID.getStatus()) taskService.terminationByInsId(bo.getId(), flowParams);
.ignore(true);
taskService.termination(flowTask.getId(), flowParams);
}
return true; return true;
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);