Merge branch '20251013_news_feihexinzhan_fe'

app/JsonRpc/ClientService.php

@@ -364,11 +364,7 @@ class ClientService implements ClientServiceInterface
                                         $textArticles[$k]->pinyin = $catiall[$v->catid][0];
                                     }
                                 }
-                                $componetList[$key]['componentData']['data']['alias'] = $websiteInfoIndexed[$category_id]->alias ?? 'aliasnull' . $category_id;
-                                $componetList[$key]['componentData']['data']['pinyin'] = $websiteInfoIndexed[$category_id]->pinyin ?? 'aliasnull' . $category_id;
-                                $componetList[$key]['componentData']['data']['category_id'] = $category_id;
-                                $componetList[$key]['componentData']['data']['textnum'] = $textArticles ?? [];
-                                $componetList[$key]['componentData']['data']['imgnum'] = $imgArticles ?? [];
+                                
                             }
                             // var_dump($level, 'level');
                             if ($level > 0) {
@@ -423,6 +419,12 @@ class ClientService implements ClientServiceInterface
                                     }
                                 }
                             }
+                            
+                            $componetList[$key]['componentData']['data']['alias'] = $websiteInfoIndexed[$category_id]->alias ?? 'aliasnull' . $category_id;
+                            $componetList[$key]['componentData']['data']['pinyin'] = $websiteInfoIndexed[$category_id]->pinyin ?? 'aliasnull' . $category_id;
+                            $componetList[$key]['componentData']['data']['category_id'] = $category_id;
+                            $componetList[$key]['componentData']['data']['textnum'] = $textArticles ?? [];
+                            $componetList[$key]['componentData']['data']['imgnum'] = $imgArticles ?? [];
                         }