From 039381b1afa8b342ba05703031bd7365a82d5567 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Tue, 10 Aug 2021 21:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=95=B4=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=A1=E5=88=92=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
index 8b5c9fb1..f45b7dc7 100644
--- a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
+++ b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
@@ -34,7 +34,7 @@
             FROM SHOP_ORDER SO
             INNER JOIN ITEM IM ON SO.PLANNED_ITEM_BO = IM.HANDLE
             INNER JOIN STATUS ST ON SO.STATUS_BO = ST.HANDLE AND ST.STATUS_GROUP = 'ORDERS'
-            INNER JOIN ROUTER RT ON SO.PLANNED_ROUTER_BO = RT.HANDLE OR SO.PLANNED_ROUTER_BO = 'RouterBO:'||RT.SITE||','||RT.ROUTER||','||RT.ROUTER_TYPE||',#'
+            INNER JOIN ROUTER RT ON SO.PLANNED_ROUTER_BO = RT.HANDLE OR (SO.PLANNED_ROUTER_BO = 'RouterBO:'||RT.SITE||','||RT.ROUTER||','||RT.ROUTER_TYPE||',#' AND RT.CURRENT_REVISION = 'true')
             INNER JOIN ROUTER_OPERATION RO ON RT.ENTRY_ROUTER_STEP_BO = RO.ROUTER_STEP_BO
             INNER JOIN OPERATION OP ON SO.SITE = OP.SITE AND SPLIT(RO.OPERATION_BO,2) = OP.OPERATION AND OP.CURRENT_REVISION = 'true'
             LEFT JOIN (