rkljw há 2 meses atrás
pai
commit
8afcb76895

+ 4 - 13
app/JsonRpc/WebsiteService.php

@@ -629,19 +629,10 @@ class WebsiteService implements WebsiteServiceInterface
             'pid' => $data['pid'], 
         ];
         $num = $data['num'];
-        $result=WebsiteCategory::where($website_id)->where($pid)->orderBy('sort')->offset($placeid)->limit($num)->get();
-        $result = $result->toArray(); 
-        // $processedIds = []; // 用于存储已经处理过的 category_id
-        // foreach ($result as $item) {
-        //     if (in_array($item->category_id, $processedIds)) {
-        //         // 如果当前 category_id 已经处理过,则跳过
-        //         continue;
-        //     }
-        //     $item->is_child = WebsiteCategory::where('pid', $item->category_id)->exists() ? 1 : 0;
-        //     // 将当前 category_id 添加到已处理列表中
-        //     $processedIds[] = $item->category_id;
-        // }
-        $result = $result->toArray(); 
+        $result=WebsiteCategory::where($website_id)->where($pid)->withCount(['children' => function ($query) use ($website_id) {
+            $query->where($website_id);
+        }])->orderBy('sort')->offset($placeid)->limit($num)->get();
+
         if(!empty($result)){ 
             return Result::success($result);  
         }else{ 

+ 2 - 1
app/Model/WebsiteCategory.php

@@ -26,6 +26,7 @@ class WebsiteCategory extends Model
     protected array $casts = [];
     public function children()
     {
-        return $this->hasMany(WebsiteCategory::class, 'pid', 'id');
+        return $this->hasMany(WebsiteCategory::class, 'pid', 'category_id');
     }
+
 }

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
runtime/container/scan.cache


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 3729
runtime/logs/hyperf.log


+ 0 - 5
vendor/composer/autoload_classmap.php

@@ -11,8 +11,6 @@ return array(
     'App\\Controller\\IndexController' => $baseDir . '/app/Controller/IndexController.php',
     'App\\Exception\\Handler\\AppExceptionHandler' => $baseDir . '/app/Exception/Handler/AppExceptionHandler.php',
     'App\\Exception\\Handler\\JsonRpcExceptionHandler' => $baseDir . '/app/Exception/Handler/JsonRpcExceptionHandler.php',
-    'App\\JsonRpc\\FooterService' => $baseDir . '/app/JsonRpc/FooterService.php',
-    'App\\JsonRpc\\FooterServiceInterface' => $baseDir . '/app/JsonRpc/FooterServiceInterface.php',
     'App\\JsonRpc\\LinkService' => $baseDir . '/app/JsonRpc/LinkService.php',
     'App\\JsonRpc\\LinkServiceInterface' => $baseDir . '/app/JsonRpc/LinkServiceInterface.php',
     'App\\JsonRpc\\PublicRpcService' => $baseDir . '/app/JsonRpc/PublicRpcService.php',
@@ -28,8 +26,6 @@ return array(
     'App\\Model\\Category' => $baseDir . '/app/Model/Category.php',
     'App\\Model\\Department' => $baseDir . '/app/Model/Department.php',
     'App\\Model\\District' => $baseDir . '/app/Model/District.php',
-    'App\\Model\\FooterCategory' => $baseDir . '/app/Model/FooterCategory.php',
-    'App\\Model\\FooterContent' => $baseDir . '/app/Model/FooterContent.php',
     'App\\Model\\LetterOfComplaint' => $baseDir . '/app/Model/LetterOfComplaint.php',
     'App\\Model\\LetterType' => $baseDir . '/app/Model/LetterType.php',
     'App\\Model\\Link' => $baseDir . '/app/Model/Link.php',
@@ -43,7 +39,6 @@ return array(
     'App\\Model\\WebsiteColumn' => $baseDir . '/app/Model/WebsiteColumn.php',
     'App\\Model\\WebsiteRole' => $baseDir . '/app/Model/WebsiteRole.php',
     'App\\Model\\WebsiteRoleUser' => $baseDir . '/app/Model/WebsiteRoleUser.php',
-    'App\\Model\\WebsiteTemplateInfo' => $baseDir . '/app/Model/WebsiteTemplateInfo.php',
     'App\\Tools\\Result' => $baseDir . '/app/Tools/Result.php',
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'CURLStringFile' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',

+ 0 - 5
vendor/composer/autoload_static.php

@@ -700,8 +700,6 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Controller\\IndexController' => __DIR__ . '/../..' . '/app/Controller/IndexController.php',
         'App\\Exception\\Handler\\AppExceptionHandler' => __DIR__ . '/../..' . '/app/Exception/Handler/AppExceptionHandler.php',
         'App\\Exception\\Handler\\JsonRpcExceptionHandler' => __DIR__ . '/../..' . '/app/Exception/Handler/JsonRpcExceptionHandler.php',
-        'App\\JsonRpc\\FooterService' => __DIR__ . '/../..' . '/app/JsonRpc/FooterService.php',
-        'App\\JsonRpc\\FooterServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/FooterServiceInterface.php',
         'App\\JsonRpc\\LinkService' => __DIR__ . '/../..' . '/app/JsonRpc/LinkService.php',
         'App\\JsonRpc\\LinkServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/LinkServiceInterface.php',
         'App\\JsonRpc\\PublicRpcService' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcService.php',
@@ -717,8 +715,6 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\Category' => __DIR__ . '/../..' . '/app/Model/Category.php',
         'App\\Model\\Department' => __DIR__ . '/../..' . '/app/Model/Department.php',
         'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
-        'App\\Model\\FooterCategory' => __DIR__ . '/../..' . '/app/Model/FooterCategory.php',
-        'App\\Model\\FooterContent' => __DIR__ . '/../..' . '/app/Model/FooterContent.php',
         'App\\Model\\LetterOfComplaint' => __DIR__ . '/../..' . '/app/Model/LetterOfComplaint.php',
         'App\\Model\\LetterType' => __DIR__ . '/../..' . '/app/Model/LetterType.php',
         'App\\Model\\Link' => __DIR__ . '/../..' . '/app/Model/Link.php',
@@ -732,7 +728,6 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\WebsiteColumn' => __DIR__ . '/../..' . '/app/Model/WebsiteColumn.php',
         'App\\Model\\WebsiteRole' => __DIR__ . '/../..' . '/app/Model/WebsiteRole.php',
         'App\\Model\\WebsiteRoleUser' => __DIR__ . '/../..' . '/app/Model/WebsiteRoleUser.php',
-        'App\\Model\\WebsiteTemplateInfo' => __DIR__ . '/../..' . '/app/Model/WebsiteTemplateInfo.php',
         'App\\Tools\\Result' => __DIR__ . '/../..' . '/app/Tools/Result.php',
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'CURLStringFile' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff