作者 lyh

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

@@ -292,6 +292,13 @@ class ProjectUpdate extends Command @@ -292,6 +292,13 @@ class ProjectUpdate extends Command
292 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 292 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
293 continue; 293 continue;
294 } 294 }
  295 + }else{
  296 + $category_id = '';
  297 + if ($item['category'] ?? []) {
  298 + $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]);
  299 + $category_id = $logic->getLastCategory(array_column($category_arr, 'id'));
  300 + }
  301 + $model->where('id',$product['id'])->update(['category_id'=>$category_id]);
295 } 302 }
296 } 303 }
297 } 304 }