diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterContant.java index 1ba1d60..6d555e2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterContant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterContant.java @@ -7,7 +7,9 @@ public interface TodoCenterContant { public class Handler { - public final static String ACTIVITY_APPROVAL = "userTask"; + public static final String ACTIVITY_APPROVAL = "userTask"; + + public static final String OR_SIGN_FLAG = "MI_END"; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java index 9588391..6f51383 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java @@ -105,7 +105,8 @@ public class WithDrawHandle { //如果上个会签没取到 还有种情况是 会签 或签 并且在上个节点 if(!isAndOr && CollUtil.isNotEmpty(beforeAndOr)) { for (ProgressNode n : beforeAndOr) { - if (n.getUserId().equals(user.getEmployeeCode())) { + if (n.getUserId().equals(user.getEmployeeCode()) + && !TodoCenterContant.Handler.OR_SIGN_FLAG.equals(n.getWithdrawFlag())) { beforeProgressNode = n; //说明当前操作人 在上个会签或者或签节点 isAndOr = Boolean.TRUE; @@ -114,8 +115,6 @@ public class WithDrawHandle { } } - - if(!isAndOr && (Objects.isNull(beforeProgressNode) || !user.getEmployeeCode().equals(beforeProgressNode.getUserId()))){ return Boolean.FALSE;