Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into master-lyh-edit

@@ -16,6 +16,7 @@ use App\Models\Domain\DomainInfo;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
+use App\Models\Template\Setting;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -85,7 +86,9 @@ class UpdateController extends BaseController
         //产品分类开启了可视化之后，不能重新采集
         //产品分类开启了可视化之后，不能重新采集
         $category_list = Category::where('project_id', $this->param['project_id'])->get();
         $category_list = Category::where('project_id', $this->param['project_id'])->get();
         if ($category_list->count() > 0) {
         if ($category_list->count() > 0) {
-            $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT, BTemplate::IS_LIST);//获取模版id
+            $bSettingModel = new Setting();
+            $template_info = $bSettingModel->read(['project_id' => $this->param['project_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->getIsRenovation(BTemplate::SOURCE_PRODUCT, BTemplate::IS_LIST, $template_id, $category['id']) == 1) {
                     //有分类开启了可视化
                     //有分类开启了可视化