Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java

@@ -7,6 +7,7 @@ import com.ningdatech.pmapi.todocenter.constant.TodoCenterContant;
 import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO;
 import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
+import com.wflow.contants.HisProInsEndActId;
 import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO;
 import com.wflow.workflow.bean.process.ProgressNode;
 import com.wflow.workflow.bean.process.enums.NodeTypeEnum;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Classname WithDrawHandle
@@ -212,9 +214,11 @@ public class WithDrawHandle {
                 .processInstanceId(instance.getId()).finished()
                 .activityType(TodoCenterContant.Handler.ACTIVITY_APPROVAL)
                 .orderByHistoricActivityInstanceEndTime().asc().list();
-
+        List<HistoricActivityInstance> instances = finished.stream()
+                .filter(a -> !HisProInsEndActId.WITHDRAW.equals(a.getDeleteReason()))
+                .collect(Collectors.toList());
         //如果有已经被审核过的 节点 返回false
-        if(CollUtil.isNotEmpty(finished)){
+        if(CollUtil.isNotEmpty(instances)){
             return Boolean.FALSE;
         }