|
|
@@ -20,7 +20,7 @@ class Exec extends \app\admin\BaseController{
|
|
|
if($param['status']!=='')$conditon[]=["status","=",$param['status']];
|
|
|
$count=Db::name("exec")->where($conditon)->count();
|
|
|
$total = ceil($count/$param['size']);
|
|
|
- $page =$param['page']>=$total ? intval($param['page']):intval($total);
|
|
|
+ $page =$param['page']>=$total ?intval($total) :intval($param['page']);
|
|
|
$list=Db::name("exec")->where($conditon)->page($page,intval($param['size']))->select()->toArray();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
|
|
@@ -125,7 +125,7 @@ class Exec extends \app\admin\BaseController{
|
|
|
if($param['relaComNo']!='')$where[]=["companyNo","=",$param['relaComNo']];
|
|
|
$count=Db::name("exec_log")->where($where)->count();
|
|
|
$total = ceil($count/$param['size']);
|
|
|
- $page =$param['page']>=$total ? intval($param['page']):intval($total);
|
|
|
+ $page =$param['page']<=$total ? intval($param['page']):intval($total);
|
|
|
$list=Db::name("exec_log")->where($where)->page($page,intval($param['size']))->order("id desc")->select()
|
|
|
->toArray();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
