Merge branch 'dev'

app/admin/controller/ReceiveProductSync.php

@@ -99,6 +99,7 @@ class ReceiveProductSync
                 }
 
                 $category   = ProductCategoryModel::language($lang_id)->tcoId($tco_category['id'])->find();
+                if (!empty($category)) {
                     $tco_parent = ProductTcoCategoryModel::language($lang_id)->tcoId($tco_category['tco_pid'])->find();
                     if (!empty($tco_parent)) {
                         $parent = ProductCategoryModel::language($lang_id)->tcoId($tco_parent['id'])->find();
@@ -109,10 +110,11 @@ class ReceiveProductSync
                         $category['path']  = $parent['path'] . $parent['pid'];
                         $category['level'] = $parent['level'] + 1;
                     }
-                if (!$category->save($category)) {
+                    if (!$category->save()) {
                         throw new \Exception('产品分类更新失败');
                     }
                 }
+            }
 
             Db::commit();
         } catch (\Throwable $th) {