From b0ace1a79ad45d30f0ca07d4c618dba1d817f9b5 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 4 Jun 2019 16:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=8F=91=E9=80=81=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E5=88=92:=E4=BB=85=E6=9F=A5=E8=AF=A2Trippest=E7=9A=84?= =?UTF-8?q?=E5=9B=A2=E8=AE=A1=E5=88=92[=E6=9C=AA=E6=8E=A5=E6=94=B6,?= =?UTF-8?q?=E6=9C=AA=E7=A1=AE=E8=AE=A4,=E6=9C=AA=E5=8F=96=E6=B6=88,?= =?UTF-8?q?=E6=9C=AA=E5=88=A0=E9=99=A4,=E6=9C=AA=E5=8F=98=E6=9B=B4,?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=E9=80=81=E5=88=B0=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/vendorPlanSync/models/Group_model.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index f4379893..9c714014 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/webht/third_party/vendorPlanSync/models/Group_model.php @@ -22,13 +22,12 @@ class Group_model extends CI_Model { inner join GRoupInfo gri on GRI_SN=VAS_GRI_SN where 1=1 AND VAS_VEI_SN in ($vendor_str) "; $sql .= $gri_sn!==0 ? $gri_sql : " - AND VAS_IsCancel=0 AND VAS_Delete=0 AND vas.DeleteFlag=0 - AND VAS_IsSendSucceed=1 AND VAS_IsReceive=0 + AND isnull(VAS_IsCancel,0)=0 AND isnull(VAS_Delete,0)=0 AND isnull(vas,0).DeleteFlag=0 + AND VAS_IsSendSucceed=1 AND isnull(VAS_IsReceive,0)=0 AND EOI_GetDate between '$start_date' AND '$end_date' - AND VAS_VEI_SN in ($vendor_str) -- Trippest, not confirm, not change -- for Trippest deploy + AND isnull(VAS_IsConfirm,0)=0 AND isnull(VAS_SendVary,0)=0 AND GRI_OrderType=227002 - AND VAS_IsConfirm=0 AND VAS_SendVary=0 AND EXISTS ( select 1 from OperatorInfo where OPI_SN=GRI_operator AND OPI_DEI_SN=30 )