From fdb6966ec8582e56b5cf909711681076c013c8f9 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Mon, 4 Jun 2018 09:49:30 +0800
Subject: [PATCH] test info meta last

---
 application/controllers/info_amp.php   | 2 +-
 application/models/infoMetas_model.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 84a3b70c..873127d8 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -242,7 +242,7 @@ class Info_amp extends CI_Controller
         if (!empty($rs)) {
             $newrs = array();
             foreach ($rs as $info) {
-                if (!empty($info->ic_content)) {
+                if (!empty($info->ic_content) && !empty($info->ic_url)) {
                     array_push($newrs, array(
                         'ic_url' => $info->ic_url,
                         'ic_id' => $info->ic_id,
diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php
index fff105a0..0b1760d0 100644
--- a/application/models/infoMetas_model.php
+++ b/application/models/infoMetas_model.php
@@ -63,6 +63,7 @@ class InfoMetas_model extends CI_Model {
             . "       ic.ic_status, \n"
             . "       ic.ic_template, \n"
             . "       ic.ic_sitecode, \n"
+            . "       ic.ic_content, \n"
             . "       im.im_id \n"
             . "       FROM   infoStructures is1 \n"
             . "       INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n"