From 04870e75745268eb649433e33167b073315c246f Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 5 Sep 2018 09:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4sql=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/train/models/BIZ_intel_train_model.php       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/third_party/train/models/BIZ_intel_train_model.php b/application/third_party/train/models/BIZ_intel_train_model.php
index 93d35c89..4860bfb1 100644
--- a/application/third_party/train/models/BIZ_intel_train_model.php
+++ b/application/third_party/train/models/BIZ_intel_train_model.php
@@ -40,16 +40,15 @@ class BIZ_intel_train_model extends CI_Model {
 				 WHERE
 						tl.isGlobal = 1
 				   AND
-						tl.trainFromCode = '{$trainFromCode}'			
+						(tl.trainFromCode = '{$trainFromCode}' {$add})			
 				   AND
 						tl.trainToCode = '{$trainToCode}'
 				   AND 
 						tl.DateRule != ''
 				   AND
 						tp.seatPriceInfo2 IS NOT NULL
+				   order by departTime asc
 				";
-		$sql .= $add;
-		$sql .= 'order by departTime asc';
 		$query = $this->HT->query($sql);
         return $query->result();						
 	}