From b742981a0fc0103aa47568442cae5f1e1a411456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Fri, 5 Jun 2020 15:50:24 +0800
Subject: [PATCH] fix

---
 .../third_party/tpmanage/controllers/webgetbokun.php        | 6 +++++-
 application/third_party/tpmanage/models/tpBokun_model.php   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/third_party/tpmanage/controllers/webgetbokun.php b/application/third_party/tpmanage/controllers/webgetbokun.php
index e0feac70..8f3271fa 100644
--- a/application/third_party/tpmanage/controllers/webgetbokun.php
+++ b/application/third_party/tpmanage/controllers/webgetbokun.php
@@ -467,8 +467,12 @@ class webgetbokun extends CI_Controller
                     foreach($listmeta as $meta){
                         $MetaData["im_key"]=$meta->im_key;
                         $MetaData["im_value"]=$meta->im_value;
-                        $data["meta"][]=$MetaData;
+                        $arrmeta[]=$MetaData;
                     }
+                    if ($arrmeta){
+                        $data["meta"]=$arrmeta;
+                    }
+                   
                 }
 
                 $result[]=$data;
diff --git a/application/third_party/tpmanage/models/tpBokun_model.php b/application/third_party/tpmanage/models/tpBokun_model.php
index 4de1f7f2..37e5eff7 100644
--- a/application/third_party/tpmanage/models/tpBokun_model.php
+++ b/application/third_party/tpmanage/models/tpBokun_model.php
@@ -285,7 +285,7 @@ class TpBokun_model extends CI_Model
      */
     function getChtToursMeta($ic_id){
         $sql = "select * from infoMetas 
-        where im_ic_id=?";
+        where im_ic_id=? and im_key<>'AMP' and im_key<>'AMP_STATUS' and im_key<>'meta_construction_code'";
         $qurey = $this->HT->query($sql,array($ic_id));
         return $qurey->result();
     }