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

@@ -562,15 +562,30 @@ class ProjectUpdate extends Command
                     $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]);
                     $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]);
                     $data = curl_c($url);
                     $data = curl_c($url);
                     if (isset($data['code']) && $data['code'] == 200) {
                     if (isset($data['code']) && $data['code'] == 200) {
-                        $category = [
-                            [
-                                'id' => 0,
-                                'name' => $custom_info['route'],
-                                'url' => '/' . $custom_info['route'],
-                                'parent' => 0,
-                                'children' => $data['data']['category'] ?? []
-                            ]
-                        ];
+                        //判断分类里面是否存在自定义模块路由
+                        $is_exist = 0;
+                        if ($data['data']['category'] ?? []) {
+                            foreach ($data['data']['category'] as $vc) {
+                                $c_route = $this->get_url_route($vc['url'] ?? '');
+                                if ($c_route == $custom_info['route']) {
+                                    $is_exist = 1;
+                                }
+                            }
+                        }
+                        if ($is_exist) {
+                            //存在，无需添加自定义模块路由为分类路由
+                            $category = $data['data']['category'];
+                        } else {
+                            //不存在，需要添加自定义模块路由为分类路由
+                            $category = [
+                                [
+                                    'id' => 0,
+                                    'name' => $custom_info['route'],
+                                    'url' => '/' . $custom_info['route'],
+                                    'parent' => $data['data']['category'] ?? []
+                                ]
+                            ];
+                        }
                         $this->category_custom_insert($project_id, $custom_info['id'], $category, 0);
                         $this->category_custom_insert($project_id, $custom_info['id'], $category, 0);
 
 
                         $count = $data['data']['count'] ?? 0;
                         $count = $data['data']['count'] ?? 0;