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 )