diff --git a/app/admin/controller/AuditController.php b/app/admin/controller/AuditController.php index a0a3ba9..8bd15e9 100644 --- a/app/admin/controller/AuditController.php +++ b/app/admin/controller/AuditController.php @@ -20,7 +20,7 @@ class AuditController extends AdminBaseController{ $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $where['phone'] = $param['keyword']; + $where['phone'] = ['like','%'.trim($param['keyword']).'%']; } $data = Db::name('sale_audit')->where($where)->order('create_time','DESC')->paginate(12); $data_arr = $data -> toArray(); @@ -30,7 +30,7 @@ class AuditController extends AdminBaseController{ } $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this -> assign('data',$data); $this -> assign('data_arr',$data_arr['data']); return $this -> fetch(); diff --git a/app/admin/controller/GoodsController.php b/app/admin/controller/GoodsController.php index bc12f47..df9b401 100644 --- a/app/admin/controller/GoodsController.php +++ b/app/admin/controller/GoodsController.php @@ -21,7 +21,7 @@ class GoodsController extends AdminBaseController{ $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $keyword = $param['keyword']; + $keyword = trim($param['keyword']); $where['book_name'] = ['like',"%$keyword%"]; } if(!empty($param['classify_id'])){ @@ -43,7 +43,7 @@ class GoodsController extends AdminBaseController{ } $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this->assign('classify_id',!empty($param['classify_id']) ? $param['classify_id'] : ''); $this -> assign('data',$data1['data']); $this -> assign('res',$data); diff --git a/app/admin/controller/OrderscourierController.php b/app/admin/controller/OrderscourierController.php index 3c9c551..c70fb89 100644 --- a/app/admin/controller/OrderscourierController.php +++ b/app/admin/controller/OrderscourierController.php @@ -20,18 +20,18 @@ class OrderscourierController extends AdminBaseController{ $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $where['order_number'] = ['like','%'.$param['keyword'].'%']; + $where['order_number'] = ['like','%'.trim($param['keyword']).'%']; } if(!empty($param['state'])){ $where['state'] = $param['state']; } - $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12); + $data = Db::name('indent')->where($where)->where("state = 2 or state = 3 or state = 5")->order('create_time','DESC')->paginate(12); $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this->assign('state',!empty($param['state']) ? $param['state'] : ''); - $this -> assign('data',$data); - return $this -> fetch(); + $this->assign('data',$data); + return $this->fetch(); } diff --git a/app/admin/controller/PlatformordersController.php b/app/admin/controller/PlatformordersController.php index 0f27d4e..3a82a0c 100644 --- a/app/admin/controller/PlatformordersController.php +++ b/app/admin/controller/PlatformordersController.php @@ -22,7 +22,7 @@ class PlatformordersController extends AdminBaseController{ $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $where['order_number|name|phone'] = ['like','%'.$param['keyword'].'%']; + $where['order_number|name|phone'] = ['like','%'.trim($param['keyword']).'%']; } if(!empty($param['state'])){ $where['state'] = $param['state']; @@ -38,7 +38,7 @@ class PlatformordersController extends AdminBaseController{ $this -> assign('data1',$data1['data']); $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword', isset($param['keyword']) ? trim($param['keyword']) : ''); $this->assign('state', isset($param['state']) ? $param['state'] : ''); $this -> assign('data',$data); return $this -> fetch(); diff --git a/app/admin/controller/SalesmanController.php b/app/admin/controller/SalesmanController.php index fd8e915..8bcdb0b 100644 --- a/app/admin/controller/SalesmanController.php +++ b/app/admin/controller/SalesmanController.php @@ -21,7 +21,7 @@ class SalesmanController extends AdminBaseController{ // $where['audit_time'] = [['>=',$start_time],['<=',$end_time]]; // } if(!empty($param['keyword'])){ - $keyword = $param['keyword']; + $keyword = trim($param['keyword']); $where['b.phone|u.user_nickname'] = ['like','%'.$keyword.'%']; } if(!empty($param['id'])){ @@ -50,8 +50,7 @@ class SalesmanController extends AdminBaseController{ } $this -> assign('data_arr',$data_arr['data']); $this -> assign('data',$data); - $this->assign('user_nickname',!empty($param['user_nickname']) ? $param['user_nickname'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this->assign('id',!empty($param['id']) ? $param['id'] : ''); return $this -> fetch(); diff --git a/app/admin/controller/SalesmangoodsController.php b/app/admin/controller/SalesmangoodsController.php index 7f4b65a..06dc25f 100644 --- a/app/admin/controller/SalesmangoodsController.php +++ b/app/admin/controller/SalesmangoodsController.php @@ -21,7 +21,7 @@ class SalesmangoodsController extends AdminBaseController{ $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $keyword = $param['keyword']; + $keyword = trim($param['keyword']); $where['a.book_name'] = ['like',"%$keyword%"]; } $data = Db::name('goods')->alias('a') @@ -32,7 +32,7 @@ class SalesmangoodsController extends AdminBaseController{ ->paginate(12); $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this -> assign('data',$data); return $this -> fetch(); diff --git a/app/admin/controller/SchoolController.php b/app/admin/controller/SchoolController.php index eeab799..ef76c9b 100644 --- a/app/admin/controller/SchoolController.php +++ b/app/admin/controller/SchoolController.php @@ -20,7 +20,7 @@ class SchoolController extends AdminBaseController{ $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $keyword = $param['keyword']; + $keyword = trim($param['keyword']); $where['school'] = ['like',"%$keyword%"]; } $data1 = Db::name('school')->where($where)->order('create_time','DESC') -> paginate(12) ; @@ -29,6 +29,9 @@ class SchoolController extends AdminBaseController{ $user_data = Db::name('user') -> where('id',$val['uid']) -> find(); $data['data'][$key]['uname'] = $user_data['user_nickname']; } + $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); + $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this -> assign('data',$data['data']); $this -> assign('res',$data1); return $this -> fetch(); diff --git a/app/admin/controller/UsersController.php b/app/admin/controller/UsersController.php index 9a6e700..ff09c02 100644 --- a/app/admin/controller/UsersController.php +++ b/app/admin/controller/UsersController.php @@ -15,7 +15,7 @@ class UsersController extends AdminBaseController{ 'a.create_time' => ['>=', 0], ]; if(!empty($param['keyword'])){ - $keyword = $param['keyword']; + $keyword = trim($param['keyword']); $where['b.user_nickname'] = ['like',"%$keyword%"]; } if(!empty($param['id'])){ @@ -66,7 +66,7 @@ class UsersController extends AdminBaseController{ } $this->assign('list',$list); $this->assign('data',$data); - $this->assign('user_nickname',!empty($param['user_nickname']) ? $param['user_nickname'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this->assign('status',!empty($param['identity']) ? $param['identity'] : ''); $this->assign('id',!empty($param['id']) ? $param['id'] : ''); return $this->fetch(); diff --git a/app/admin/controller/WithdrawalController.php b/app/admin/controller/WithdrawalController.php index 1918b7d..bd000be 100644 --- a/app/admin/controller/WithdrawalController.php +++ b/app/admin/controller/WithdrawalController.php @@ -21,7 +21,7 @@ class WithdrawalController extends AdminBaseController{ $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $where['b.phone'] = ['like','%'.$param['keyword'].'%']; + $where['b.phone'] = ['like','%'.trim($param['keyword']).'%']; } $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(12); $data_arr = $data -> toArray(); @@ -33,7 +33,7 @@ class WithdrawalController extends AdminBaseController{ } $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this -> assign('data_arr',$data_arr['data']); $this -> assign('data',$data); return $this -> fetch(); @@ -52,7 +52,7 @@ class WithdrawalController extends AdminBaseController{ $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; } if(!empty($param['keyword'])){ - $where['b.phone'] = ['like','%'.$param['keyword'].'%']; + $where['b.phone'] = ['like','%'.trim($param['keyword']).'%']; } $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> order("a.create_time desc") -> paginate(12); $data_arr = $data -> toArray(); @@ -64,7 +64,7 @@ class WithdrawalController extends AdminBaseController{ } $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); $this -> assign('data_arr',$data_arr['data']); $this -> assign('data',$data); return $this -> fetch();