合并分支 'akun' 到 'master'

Akun



查看合并请求 !536

@@ -90,7 +90,7 @@ class UpdateController extends BaseController
             $template_info = $bSettingModel->read(['project_id' => $this->param['project_id']]);
             $template_info = $bSettingModel->read(['project_id' => $this->param['project_id']]);
             $template_id = $template_info ? $template_info['template_id'] : 0;//获取模版id
             $template_id = $template_info ? $template_info['template_id'] : 0;//获取模版id
             foreach ($category_list as $category) {
             foreach ($category_list as $category) {
-                if ($this->getIsRenovation(BTemplate::SOURCE_PRODUCT, BTemplate::IS_LIST, $template_id, $category['id']) == 1) {
+                if ($this->getRenovation($this->param['project_id'], BTemplate::SOURCE_PRODUCT, BTemplate::IS_LIST, $template_id, $category['id']) == 1) {
                     //有分类开启了可视化
                     //有分类开启了可视化
                     $this->param['type'] = 0;
                     $this->param['type'] = 0;
                     break;
                     break;
@@ -198,4 +198,22 @@ class UpdateController extends BaseController
 
 
         $this->response('采集任务添加成功');
         $this->response('采集任务添加成功');
     }
     }
+
+    public function getRenovation($project_id,$source, $is_list, $template_id, $id, $is_custom = 0)
+    {
+        $webTemplateModel = new BTemplate();
+        $param = [
+            'source' => $source,
+            'project_id' => $project_id,
+            'source_id' => $id,
+            'template_id' => $template_id,
+            'is_list' => $is_list,
+            'is_custom' => $is_custom
+        ];
+        $templateInfo = $webTemplateModel->read($param);
+        if ($templateInfo !== false) {
+            return 1;
+        }
+        return 0;
+    }
 }
 }