update - 测试创建子任务时,添加父任务的 ExecutionId
This commit is contained in:
parent
58dceaa162
commit
ccea7bbc08
@ -13,6 +13,7 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT;
|
||||
import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.REJECTION_AUTO_COMPLETED;
|
||||
import static org.mapstruct.NullValueCheckStrategy.ALWAYS;
|
||||
|
||||
@ -56,7 +57,7 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter<BpmnH
|
||||
List<BpmnHistoricTaskInstanceVO> vos = new ArrayList<>();
|
||||
entities.stream()
|
||||
.filter(i -> !Objects.equals(DELETE_REASON_END, i.getDeleteReason()))
|
||||
.filter(i -> !Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason()))
|
||||
.filter(i -> (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) || (!Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())))
|
||||
.forEach(i -> vos.add(toVo(i)));
|
||||
return vos;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user