diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 1bcc5e4..d6b34b9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -248,8 +248,10 @@ //根据流程定义查询该业务所有未完成的流程实例 historicProcessInstances = historyService.createHistoricProcessInstanceQuery() .deploymentId(flowForm.getDeployId()) + .or() .unfinished() - .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态,因为驳回操作中设置为该状态 + .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态,因为驳回操作中设置为该状态 + .endOr() .orderByProcessInstanceStartTime().desc() .list(); }else{ @@ -260,8 +262,10 @@ //根据流程定义、登录用户id查询该业务未完成的流程实例 historicProcessInstances = historyService.createHistoricProcessInstanceQuery() .deploymentId(flowForm.getDeployId()) + .or() .unfinished() - .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态,因为驳回操作中设置为该状态 + .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态,因为驳回操作中设置为该状态 + .endOr() .startedBy(String.valueOf(user.getId())) .orderByProcessInstanceStartTime().desc() .list();