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

变更数据



查看合并请求 !2884

@@ -96,7 +96,6 @@ class TicketUploadDataController extends BaseController
             $filed = 'name';
             $filed = 'name';
             if($type == 1){
             if($type == 1){
                 $cateModel = new Category();
                 $cateModel = new Category();
-                $keywodModel = new KeyWord();
                 $filed = 'title';
                 $filed = 'title';
             }elseif ($type == 2){
             }elseif ($type == 2){
                 $cateModel = new BlogCategory();
                 $cateModel = new BlogCategory();
@@ -108,6 +107,7 @@ class TicketUploadDataController extends BaseController
                     ->pluck($filed, 'id')
                     ->pluck($filed, 'id')
                     ->toArray();
                     ->toArray();
                 if($type == 1){
                 if($type == 1){
+                    $keywodModel = new KeyWord();
                     $keywod_arr = $keywodModel->whereIn('id', (array)$keyword_id)
                     $keywod_arr = $keywodModel->whereIn('id', (array)$keyword_id)
                         ->pluck($filed, 'id')
                         ->pluck($filed, 'id')
                         ->toArray();
                         ->toArray();