Merge branch '20241213_fr_diyweb' into dev

app/JsonRpc/FooterService.php

@@ -28,24 +28,25 @@ class FooterService implements FooterServiceInterface
         if(isset($data['name'])){
             array_push($where, ['footer_category.name','like','%'.$data['name'].'%']);
         }
-        $query = FooterCategory::when(!empty($where), function ($query) use ($where) {
-            $query->where($where)
-            ->leftJoin("website","website.id","footer_category.website_id")
-            ->select("footer_category.*","website.website_name","website.id as website_id");
-        });
+        $query = FooterCategory::query();
+        if (!empty($where)) {
+            $query->where($where);
+        }
         $count = $query->count();
-        $query = clone $query;
-        $rep = $query    
-        ->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->orderBy("updated_at","desc")
-        ->get();
-        // $count = $query->count();
+        $rep = $query->leftJoin("website", "website.id", "footer_category.website_id")
+            ->select("footer_category.*", "website.website_name", "website.id as website_id")
+            ->offset(($data['page'] - 1) * $data['pageSize'])
+            ->limit($data['pageSize'])
+            ->orderByDesc("updated_at")
+            ->get();
+        
         // var_dump($where);
         $result  = [];
         $result = [
             'rows'=>$rep,
             'count'=>$count
         ];
-        if($count == 0){
+        if(empty($result)){
             return Result::error("没有查到相关数据！");
         }
         return Result::success($result);
@@ -207,6 +208,7 @@ class FooterService implements FooterServiceInterface
                 array_push($where, ['con_title','like','%'.$data['con_title'].'%']);
             }
         }
+        $count = FooterContent::where($where)->count();
         $rep = FooterContent::where($where)
         ->leftJoin('footer_category','footer_category.id','fcat_id')
         ->select('footer_content.*','footer_category.type')
@@ -214,8 +216,8 @@ class FooterService implements FooterServiceInterface
         ->offset(($data['page']-1)*$data['pageSize'])
         ->orderBy("updated_at","desc")
         ->get();
-        $count = FooterContent::where($where)->count();
-        if($count == 0){
+        
+        if(empty($rep)){
             return Result::error("没有查到相关数据！");
         }else{
             $result = [