yingzi 2 سال پیش
والد
کامیت
918d8aad90
1فایلهای تغییر یافته به همراه10 افزوده شده و 24 حذف شده
  1. 10 24
      app/system/controller/ServiceLabel.php

+ 10 - 24
app/system/controller/ServiceLabel.php

@@ -25,33 +25,19 @@ class ServiceLabel extends  BaseController{
      * @return type
      * @return type
      */
      */
     public function list(Request $request) {
     public function list(Request $request) {
-        $pageSize = 50;
         $post =  UtilService::getMore([
         $post =  UtilService::getMore([
-                ['page',1],
-                ['title',''],
-                ['status',''],
+            ['page',1],
+            ['pageSize', 50],
+            ['title',''],
+            ['status',''],
+            
         ],$request);
         ],$request);
-        $where=[];
-        if(in_array((string)$post["status"],['0','1'])){
-            $where[]=["status","=",(int)$post["status"]];
-        }
-        if(!empty($post["title"])){
-            $where[]=["title","like","%{$post["title"]}%"];
-        }
-        $data = (new LabelModel)
-                ->where($where)
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("seq","desc")
-                ->order("id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new LabelModel)->where($where)->count();
-        $data = empty($data)?[]:$data;
+        $data = (new LabelModel)->getList($post);
         return app('json')->success([
         return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"]
+            'list'      => $data["list"],
+            'pageCount' => $data["totalCount"],
+            'pageSize'  => $data["pageSize"],
+            'page'      => $data["page"],
         ]);
         ]);
     }
     }