Merge branch '0307_linkbug_fr' into dev

app/JsonRpc/LinkService.php

@@ -16,25 +16,32 @@ class LinkService implements LinkServiceInterface
      */
     public function getLinkList(array $data): array
     {
+        // return Result::success($data);
         $where = [];
-        if(isset($data['title']) && $data['title']!=''){
-            array_push($where, ['link.title','like','%'.$data['title'].'%']);
+        if(isset($data['title']) && !empty($data['title'])){
+            array_push($where,['link.title','like','%'.$data['title'].'%']);
         }
-        if(isset($data['website_id']) && $data['website_id']!=''){
-            array_push($where,  ['link.website_id','=',$data['website_id']]);
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            array_push($where,['link.website_id','=',$data['website_id']]);
         }
-        $rep = Link::where($where)
-            ->leftJoin("website","website.id","link.website_id")
-            ->select("link.*","website.website_name")
-            ->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->orderBy("sort","desc")->get();
-        $count = Link::where($where)
-            ->leftJoin("website","website.id","link.website_id")
-            ->count();
+        $result  = [];
+        // return Result::success($where);
+        if(!empty($where)){
+            $query = Link::where($where);
+        }else{
+            $query = Link::query();
+        }
+        $rep = $query
+            ->leftJoin("website", "website.id", "link.website_id")
+            ->select("link.*", "website.website_name")
+            ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])
+            ->orderBy("sort", "asc")
+            ->get();
+        $count = $query->count();
         $result = [
             'rows'=>$rep,
             'count'=>$count
         ];
-
         return $result?Result::success($result):Result::error("没有查到数据");
     }
 
@@ -67,12 +74,15 @@ class LinkService implements LinkServiceInterface
     }
 
     /**
-     * @param int $id
+     * @param array $data
      * @return array
      */
     public function delLink(array $data): array
     {
+        // return Result::success($data);
         $result = Link::where('id', $data['id'])->delete();
+        // return Result::success($result);
+        // var_dump($result);
         if (empty($result)) {
             return Result::error("删除失败", 0);
         } else {

app/JsonRpc/LinkServiceInterface.php

@@ -21,7 +21,7 @@ interface LinkServiceInterface
     public function updateLink(array $data): array;
 
     /**
-     * @param int $id
+     * @param array $data
      * @return array
      */
     public function delLink(array $data): array;