作者 刘锟

升级项目自定义模块采集调整

@@ -562,24 +562,30 @@ class ProjectUpdate extends Command @@ -562,24 +562,30 @@ class ProjectUpdate extends Command
562 $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]); 562 $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]);
563 $data = curl_c($url); 563 $data = curl_c($url);
564 if (isset($data['code']) && $data['code'] == 200) { 564 if (isset($data['code']) && $data['code'] == 200) {
565 - $children = []; 565 + //判断分类里面是否存在自定义模块路由
  566 + $is_exist = 0;
566 if ($data['data']['category'] ?? []) { 567 if ($data['data']['category'] ?? []) {
567 foreach ($data['data']['category'] as $vc) { 568 foreach ($data['data']['category'] as $vc) {
568 $c_route = $this->get_url_route($vc['url'] ?? ''); 569 $c_route = $this->get_url_route($vc['url'] ?? '');
569 - if ($c_route != $custom_info['route']) {  
570 - $children[] = $vc; 570 + if ($c_route == $custom_info['route']) {
  571 + $is_exist = 1;
571 } 572 }
572 } 573 }
573 } 574 }
574 - $category = [  
575 - [  
576 - 'id' => 0,  
577 - 'name' => $custom_info['route'],  
578 - 'url' => '/' . $custom_info['route'],  
579 - 'parent' => 0,  
580 - 'children' => $children  
581 - ]  
582 - ]; 575 + if ($is_exist) {
  576 + //存在,无需添加自定义模块路由为分类路由
  577 + $category = $data['data']['category'];
  578 + } else {
  579 + //不存在,需要添加自定义模块路由为分类路由
  580 + $category = [
  581 + [
  582 + 'id' => 0,
  583 + 'name' => $custom_info['route'],
  584 + 'url' => '/' . $custom_info['route'],
  585 + 'parent' => $data['data']['category'] ?? []
  586 + ]
  587 + ];
  588 + }
583 $this->category_custom_insert($project_id, $custom_info['id'], $category, 0); 589 $this->category_custom_insert($project_id, $custom_info['id'], $category, 0);
584 590
585 $count = $data['data']['count'] ?? 0; 591 $count = $data['data']['count'] ?? 0;