作者 刘锟

合并分支 'akun' 到 'master'

update



查看合并请求 !1973
@@ -305,11 +305,9 @@ class ProjectUpdate extends Command @@ -305,11 +305,9 @@ class ProjectUpdate extends Command
305 $category_id = ''; 305 $category_id = '';
306 $category_arr = []; 306 $category_arr = [];
307 if ($item['category'] ?? []) { 307 if ($item['category'] ?? []) {
308 - if ($project_id == 4075) { 308 + if ($project_id == 4075 && count($item['category']) == 1 && $item['category'][0]['name'] == 'Featured') {
309 //4075项目特殊处理:不采集Featured分类下的产品 309 //4075项目特殊处理:不采集Featured分类下的产品
310 - if (count($item['category']) == 1 && $item['category'][0]['name'] == 'Featured') {  
311 - continue;  
312 - } 310 + continue;
313 } 311 }
314 $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]); 312 $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]);
315 $category_id = $logic->getLastCategory(array_column($category_arr, 'id')); 313 $category_id = $logic->getLastCategory(array_column($category_arr, 'id'));