diff --git a/src/weaver/interfaces/kr/workflow/action/KrLeaveRepeatAction.java b/src/weaver/interfaces/kr/workflow/action/KrLeaveRepeatAction.java index 4c0191a..351fe02 100644 --- a/src/weaver/interfaces/kr/workflow/action/KrLeaveRepeatAction.java +++ b/src/weaver/interfaces/kr/workflow/action/KrLeaveRepeatAction.java @@ -36,7 +36,7 @@ public class KrLeaveRepeatAction implements Action { } String billTableName = requestInfo.getRequestManager().getBillTableName(); RecordSet rs = new RecordSet(); - rs.executeQuery("select count(1) as num from " + billTableName + " where resourceId = ? and jqlx =? and requestid != ? and spzt != 2", resourceId, leaveType, requestInfo.getRequestid()); + rs.executeQuery("select count(1) as num from " + billTableName + " a LEFT JOIN workflow_requestbase w ON a.requestid = w.requestid where a.resourceId = ? and a.jqlx =? and a.requestid != ? and w.currentnodetype IN ( 1, 2 )", resourceId, leaveType, requestInfo.getRequestid()); if (rs.next()) { int num = rs.getInt("num"); if (num > 0) {