gx聚合页关键字前后缀

@@ -30,6 +30,9 @@ class AggregateKeywordAffixLogic extends BaseLogic
      */
      */
     public function getAffix(){
     public function getAffix(){
         $data = $this->model->read(['project_id'=>$this->param['project_id']]);
         $data = $this->model->read(['project_id'=>$this->param['project_id']]);
+        if($data === false){
+            $data = [];
+        }
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 

@@ -49,10 +49,16 @@ class CustomTemplateLogic extends BaseLogic
         if($info === false){
         if($info === false){
             $this->fail('当前数据不存在');
             $this->fail('当前数据不存在');
         }
         }
+        if(!empty($info['html'])){
+            $info['is_renovation'] = 1;
+        }else{
+            $info['html'] = $info['text'];
+            $info['is_renovation'] = 0;
+        }
         $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
         if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
             $template_id = $this->getTemplateId();
             $template_id = $this->getTemplateId();
-            $html = $this->getTemplateComHtml(empty($info['html']) ? $info['text'] : $info['html'],$info['html_style'],$template_id);
+            $html = $this->getTemplateComHtml($info['html'],$info['html_style'],$template_id);
             $info['html'] = $this->getHeadFooter($html);
             $info['html'] = $this->getHeadFooter($html);
         }
         }
         return $this->success($info);
         return $this->success($info);