修改获取静态资源列表

app/JsonRpc/WebsiteService.php

@@ -2534,17 +2534,17 @@ class WebsiteService implements WebsiteServiceInterface
         // return Result::success($data);
         $where = [];
         if(isset($data['img_alias']) &&!empty($data['img_alias'])){
-            array_push($where, ['img_alias', 'like', '%'. $data['img_alias']. '%']);
+            array_push($where, ['website_img.img_alias', 'like', '%'. $data['img_alias']. '%']);
         }
         if(isset($data['img_type']) &&!empty($data['img_type'])){
-            array_push($where, ['img_type', '=', $data['img_type']]);
+            array_push($where, ['website_img.img_type', '=', $data['img_type']]);
         }
         if(isset($data['website_name']) &&!empty($data['website_name'])){
             $website = Website::where('website_name','like','%'.$data['website_name'].'%')->first();
             if(empty($website)){
                 return Result::error("没有查找到相关数据", 0);
             }else{
-                array_push($where, ['website_id', '=', $website['id']]);
+                array_push($where, ['website_img.website_id', '=', $website['id']]);
             }
         }
         // return Result::success($where);
@@ -2553,7 +2553,11 @@ class WebsiteService implements WebsiteServiceInterface
         })
         ->orderBy('updated_at', 'desc');
         $count = $query->count();
-        $row = $query->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])->get();
+        $row = $query->leftJoin('website', 'website.id', '=', 'website_img.website_id')
+        ->select('website_img.*', 'website.website_name')
+        ->limit($data['pageSize'])
+        ->offset(($data['page'] - 1) * $data['pageSize'])
+        ->get();
         if (empty($row)) {
             return Result::error("没有查找到相关数据", 0);
         } else {