合并分支 'lyh-server' 到 'master'

gx脚本



查看合并请求 !2019

@@ -15,6 +15,7 @@ use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiBlogAuthor;
 use App\Models\Ai\AiBlogAuthor;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\V6WeeklyReport;
 use App\Models\Com\V6WeeklyReport;
+use App\Models\Product\Category;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
@@ -60,7 +61,9 @@ class lyhDemo extends Command
             ProjectServer::useProject($val['id']);
             ProjectServer::useProject($val['id']);
             $bTemplateMainModel = new BTemplateMain();
             $bTemplateMainModel = new BTemplateMain();
             $info = $bTemplateMainModel->read(['type'=>2,'is_list'=>1],['id']);
             $info = $bTemplateMainModel->read(['type'=>2,'is_list'=>1],['id']);
-            if($info === false){
+            $categoryModel = new Category();
+            $count = $categoryModel->counts(['id'=>['>',0]]);
+            if(($info === false) && ($count > 0)){
                 $data[] = $val['id'];
                 $data[] = $val['id'];
             }
             }
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');