From b11dab66cfd170b35b5b110f0d31a7921a8f92f0 Mon Sep 17 00:00:00 2001
From: wangjie <805650258@qq.com>
Date: Tue, 11 Jul 2023 14:59:13 +0800
Subject: [PATCH] =?UTF-8?q?#=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20=E5=8F=AA=E5=85=81=E8=AE=B8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=20=E5=90=8C=E4=B8=80=E4=B8=AA=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=E7=B1=BB=E5=9E=8B=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E5=9C=A8=E9=80=94=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/kr/workflow/action/KrLeaveRepeatAction.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {