更新 'application/admin/controller/Article.php'

application/admin/controller/Article.php

@@ -20,28 +20,13 @@ class Article extends Base
     public function lst_data(Request $request){//文章列表json数据动态表格显示（分页）
         $user = new ArticleModel();
         $title = request()->param('title');//接收请求数据id
+      
+        $where='1=1';//没有搜索条件则默认查询所有数据
         if(!empty($title)){//不为空执行搜索条件，为空则跳过判断条件直接显示列表页，
             $where = ['title'=>$title];
-            //数据表获取总记录数           
-            $count = $user->where($where)->count();
-            //获取每页显示的条数
-            $limit= $request->param('limit');
-            //获取当前页码
-            $page= $request->param('page');
-            //limit的起始位置
-            $start=($page-1)*$limit; 
-            $list = $user
-                    ->limit("$start,$limit")
-                    ->where($where)
-                    ->select();
-            //返回数据
-            foreach ($list as $k => $v) {
-                $list[$k]['time'] = date('Y-m-d H:i:s',$v['time']);
-            }
-            return ["code"=>0,"msg"=>"成功","count"=>$count,"data"=>$list];
-        }
+        }   
         //数据表获取总记录数           
-        $count = $user->count();
+        $count = $user->where($where)->count();
         //获取每页显示的条数
         $limit= $request->param('limit');
         //获取当前页码
@@ -50,6 +35,7 @@ class Article extends Base
         $start=($page-1)*$limit;
         $list = $user
                 ->limit("$start,$limit")
+                ->where($where)
                 ->select();
         //返回数据
         foreach ($list as $k => $v) {