正在显示
9 个修改的文件
包含
25 行增加
和
23 行删除
| @@ -20,7 +20,7 @@ class AuditController extends AdminBaseController{ | @@ -20,7 +20,7 @@ class AuditController extends AdminBaseController{ | ||
| 20 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; | 20 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 21 | } | 21 | } |
| 22 | if(!empty($param['keyword'])){ | 22 | if(!empty($param['keyword'])){ |
| 23 | - $where['phone'] = $param['keyword']; | 23 | + $where['phone'] = ['like','%'.trim($param['keyword']).'%']; |
| 24 | } | 24 | } |
| 25 | $data = Db::name('sale_audit')->where($where)->order('create_time','DESC')->paginate(12); | 25 | $data = Db::name('sale_audit')->where($where)->order('create_time','DESC')->paginate(12); |
| 26 | $data_arr = $data -> toArray(); | 26 | $data_arr = $data -> toArray(); |
| @@ -30,7 +30,7 @@ class AuditController extends AdminBaseController{ | @@ -30,7 +30,7 @@ class AuditController extends AdminBaseController{ | ||
| 30 | } | 30 | } |
| 31 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 31 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
| 32 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 32 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
| 33 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 33 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 34 | $this -> assign('data',$data); | 34 | $this -> assign('data',$data); |
| 35 | $this -> assign('data_arr',$data_arr['data']); | 35 | $this -> assign('data_arr',$data_arr['data']); |
| 36 | return $this -> fetch(); | 36 | return $this -> fetch(); |
| @@ -21,7 +21,7 @@ class GoodsController extends AdminBaseController{ | @@ -21,7 +21,7 @@ class GoodsController extends AdminBaseController{ | ||
| 21 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; | 21 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 22 | } | 22 | } |
| 23 | if(!empty($param['keyword'])){ | 23 | if(!empty($param['keyword'])){ |
| 24 | - $keyword = $param['keyword']; | 24 | + $keyword = trim($param['keyword']); |
| 25 | $where['book_name'] = ['like',"%$keyword%"]; | 25 | $where['book_name'] = ['like',"%$keyword%"]; |
| 26 | } | 26 | } |
| 27 | if(!empty($param['classify_id'])){ | 27 | if(!empty($param['classify_id'])){ |
| @@ -43,7 +43,7 @@ class GoodsController extends AdminBaseController{ | @@ -43,7 +43,7 @@ class GoodsController extends AdminBaseController{ | ||
| 43 | } | 43 | } |
| 44 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 44 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
| 45 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 45 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
| 46 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 46 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 47 | $this->assign('classify_id',!empty($param['classify_id']) ? $param['classify_id'] : ''); | 47 | $this->assign('classify_id',!empty($param['classify_id']) ? $param['classify_id'] : ''); |
| 48 | $this -> assign('data',$data1['data']); | 48 | $this -> assign('data',$data1['data']); |
| 49 | $this -> assign('res',$data); | 49 | $this -> assign('res',$data); |
| @@ -20,18 +20,18 @@ class OrderscourierController extends AdminBaseController{ | @@ -20,18 +20,18 @@ class OrderscourierController extends AdminBaseController{ | ||
| 20 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; | 20 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 21 | } | 21 | } |
| 22 | if(!empty($param['keyword'])){ | 22 | if(!empty($param['keyword'])){ |
| 23 | - $where['order_number'] = ['like','%'.$param['keyword'].'%']; | 23 | + $where['order_number'] = ['like','%'.trim($param['keyword']).'%']; |
| 24 | } | 24 | } |
| 25 | if(!empty($param['state'])){ | 25 | if(!empty($param['state'])){ |
| 26 | $where['state'] = $param['state']; | 26 | $where['state'] = $param['state']; |
| 27 | } | 27 | } |
| 28 | - $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12); | 28 | + $data = Db::name('indent')->where($where)->where("state = 2 or state = 3 or state = 5")->order('create_time','DESC')->paginate(12); |
| 29 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 29 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
| 30 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 30 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
| 31 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 31 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 32 | $this->assign('state',!empty($param['state']) ? $param['state'] : ''); | 32 | $this->assign('state',!empty($param['state']) ? $param['state'] : ''); |
| 33 | - $this -> assign('data',$data); | ||
| 34 | - return $this -> fetch(); | 33 | + $this->assign('data',$data); |
| 34 | + return $this->fetch(); | ||
| 35 | 35 | ||
| 36 | } | 36 | } |
| 37 | 37 |
| @@ -22,7 +22,7 @@ class PlatformordersController extends AdminBaseController{ | @@ -22,7 +22,7 @@ class PlatformordersController extends AdminBaseController{ | ||
| 22 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; | 22 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 23 | } | 23 | } |
| 24 | if(!empty($param['keyword'])){ | 24 | if(!empty($param['keyword'])){ |
| 25 | - $where['order_number|name|phone'] = ['like','%'.$param['keyword'].'%']; | 25 | + $where['order_number|name|phone'] = ['like','%'.trim($param['keyword']).'%']; |
| 26 | } | 26 | } |
| 27 | if(!empty($param['state'])){ | 27 | if(!empty($param['state'])){ |
| 28 | $where['state'] = $param['state']; | 28 | $where['state'] = $param['state']; |
| @@ -38,7 +38,7 @@ class PlatformordersController extends AdminBaseController{ | @@ -38,7 +38,7 @@ class PlatformordersController extends AdminBaseController{ | ||
| 38 | $this -> assign('data1',$data1['data']); | 38 | $this -> assign('data1',$data1['data']); |
| 39 | $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : ''); | 39 | $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : ''); |
| 40 | $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : ''); | 40 | $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : ''); |
| 41 | - $this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : ''); | 41 | + $this->assign('keyword', isset($param['keyword']) ? trim($param['keyword']) : ''); |
| 42 | $this->assign('state', isset($param['state']) ? $param['state'] : ''); | 42 | $this->assign('state', isset($param['state']) ? $param['state'] : ''); |
| 43 | $this -> assign('data',$data); | 43 | $this -> assign('data',$data); |
| 44 | return $this -> fetch(); | 44 | return $this -> fetch(); |
| @@ -21,7 +21,7 @@ class SalesmanController extends AdminBaseController{ | @@ -21,7 +21,7 @@ class SalesmanController extends AdminBaseController{ | ||
| 21 | // $where['audit_time'] = [['>=',$start_time],['<=',$end_time]]; | 21 | // $where['audit_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 22 | // } | 22 | // } |
| 23 | if(!empty($param['keyword'])){ | 23 | if(!empty($param['keyword'])){ |
| 24 | - $keyword = $param['keyword']; | 24 | + $keyword = trim($param['keyword']); |
| 25 | $where['b.phone|u.user_nickname'] = ['like','%'.$keyword.'%']; | 25 | $where['b.phone|u.user_nickname'] = ['like','%'.$keyword.'%']; |
| 26 | } | 26 | } |
| 27 | if(!empty($param['id'])){ | 27 | if(!empty($param['id'])){ |
| @@ -50,8 +50,7 @@ class SalesmanController extends AdminBaseController{ | @@ -50,8 +50,7 @@ class SalesmanController extends AdminBaseController{ | ||
| 50 | } | 50 | } |
| 51 | $this -> assign('data_arr',$data_arr['data']); | 51 | $this -> assign('data_arr',$data_arr['data']); |
| 52 | $this -> assign('data',$data); | 52 | $this -> assign('data',$data); |
| 53 | - $this->assign('user_nickname',!empty($param['user_nickname']) ? $param['user_nickname'] : ''); | ||
| 54 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 53 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 55 | $this->assign('id',!empty($param['id']) ? $param['id'] : ''); | 54 | $this->assign('id',!empty($param['id']) ? $param['id'] : ''); |
| 56 | return $this -> fetch(); | 55 | return $this -> fetch(); |
| 57 | 56 |
| @@ -21,7 +21,7 @@ class SalesmangoodsController extends AdminBaseController{ | @@ -21,7 +21,7 @@ class SalesmangoodsController extends AdminBaseController{ | ||
| 21 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; | 21 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 22 | } | 22 | } |
| 23 | if(!empty($param['keyword'])){ | 23 | if(!empty($param['keyword'])){ |
| 24 | - $keyword = $param['keyword']; | 24 | + $keyword = trim($param['keyword']); |
| 25 | $where['a.book_name'] = ['like',"%$keyword%"]; | 25 | $where['a.book_name'] = ['like',"%$keyword%"]; |
| 26 | } | 26 | } |
| 27 | $data = Db::name('goods')->alias('a') | 27 | $data = Db::name('goods')->alias('a') |
| @@ -32,7 +32,7 @@ class SalesmangoodsController extends AdminBaseController{ | @@ -32,7 +32,7 @@ class SalesmangoodsController extends AdminBaseController{ | ||
| 32 | ->paginate(12); | 32 | ->paginate(12); |
| 33 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 33 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
| 34 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 34 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
| 35 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 35 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 36 | $this -> assign('data',$data); | 36 | $this -> assign('data',$data); |
| 37 | return $this -> fetch(); | 37 | return $this -> fetch(); |
| 38 | 38 |
| @@ -20,7 +20,7 @@ class SchoolController extends AdminBaseController{ | @@ -20,7 +20,7 @@ class SchoolController extends AdminBaseController{ | ||
| 20 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; | 20 | $where['create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 21 | } | 21 | } |
| 22 | if(!empty($param['keyword'])){ | 22 | if(!empty($param['keyword'])){ |
| 23 | - $keyword = $param['keyword']; | 23 | + $keyword = trim($param['keyword']); |
| 24 | $where['school'] = ['like',"%$keyword%"]; | 24 | $where['school'] = ['like',"%$keyword%"]; |
| 25 | } | 25 | } |
| 26 | $data1 = Db::name('school')->where($where)->order('create_time','DESC') -> paginate(12) ; | 26 | $data1 = Db::name('school')->where($where)->order('create_time','DESC') -> paginate(12) ; |
| @@ -29,6 +29,9 @@ class SchoolController extends AdminBaseController{ | @@ -29,6 +29,9 @@ class SchoolController extends AdminBaseController{ | ||
| 29 | $user_data = Db::name('user') -> where('id',$val['uid']) -> find(); | 29 | $user_data = Db::name('user') -> where('id',$val['uid']) -> find(); |
| 30 | $data['data'][$key]['uname'] = $user_data['user_nickname']; | 30 | $data['data'][$key]['uname'] = $user_data['user_nickname']; |
| 31 | } | 31 | } |
| 32 | + $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | ||
| 33 | + $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | ||
| 34 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); | ||
| 32 | $this -> assign('data',$data['data']); | 35 | $this -> assign('data',$data['data']); |
| 33 | $this -> assign('res',$data1); | 36 | $this -> assign('res',$data1); |
| 34 | return $this -> fetch(); | 37 | return $this -> fetch(); |
| @@ -15,7 +15,7 @@ class UsersController extends AdminBaseController{ | @@ -15,7 +15,7 @@ class UsersController extends AdminBaseController{ | ||
| 15 | 'a.create_time' => ['>=', 0], | 15 | 'a.create_time' => ['>=', 0], |
| 16 | ]; | 16 | ]; |
| 17 | if(!empty($param['keyword'])){ | 17 | if(!empty($param['keyword'])){ |
| 18 | - $keyword = $param['keyword']; | 18 | + $keyword = trim($param['keyword']); |
| 19 | $where['b.user_nickname'] = ['like',"%$keyword%"]; | 19 | $where['b.user_nickname'] = ['like',"%$keyword%"]; |
| 20 | } | 20 | } |
| 21 | if(!empty($param['id'])){ | 21 | if(!empty($param['id'])){ |
| @@ -66,7 +66,7 @@ class UsersController extends AdminBaseController{ | @@ -66,7 +66,7 @@ class UsersController extends AdminBaseController{ | ||
| 66 | } | 66 | } |
| 67 | $this->assign('list',$list); | 67 | $this->assign('list',$list); |
| 68 | $this->assign('data',$data); | 68 | $this->assign('data',$data); |
| 69 | - $this->assign('user_nickname',!empty($param['user_nickname']) ? $param['user_nickname'] : ''); | 69 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 70 | $this->assign('status',!empty($param['identity']) ? $param['identity'] : ''); | 70 | $this->assign('status',!empty($param['identity']) ? $param['identity'] : ''); |
| 71 | $this->assign('id',!empty($param['id']) ? $param['id'] : ''); | 71 | $this->assign('id',!empty($param['id']) ? $param['id'] : ''); |
| 72 | return $this->fetch(); | 72 | return $this->fetch(); |
| @@ -21,7 +21,7 @@ class WithdrawalController extends AdminBaseController{ | @@ -21,7 +21,7 @@ class WithdrawalController extends AdminBaseController{ | ||
| 21 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; | 21 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 22 | } | 22 | } |
| 23 | if(!empty($param['keyword'])){ | 23 | if(!empty($param['keyword'])){ |
| 24 | - $where['b.phone'] = ['like','%'.$param['keyword'].'%']; | 24 | + $where['b.phone'] = ['like','%'.trim($param['keyword']).'%']; |
| 25 | } | 25 | } |
| 26 | $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(12); | 26 | $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> paginate(12); |
| 27 | $data_arr = $data -> toArray(); | 27 | $data_arr = $data -> toArray(); |
| @@ -33,7 +33,7 @@ class WithdrawalController extends AdminBaseController{ | @@ -33,7 +33,7 @@ class WithdrawalController extends AdminBaseController{ | ||
| 33 | } | 33 | } |
| 34 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 34 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
| 35 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 35 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
| 36 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 36 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 37 | $this -> assign('data_arr',$data_arr['data']); | 37 | $this -> assign('data_arr',$data_arr['data']); |
| 38 | $this -> assign('data',$data); | 38 | $this -> assign('data',$data); |
| 39 | return $this -> fetch(); | 39 | return $this -> fetch(); |
| @@ -52,7 +52,7 @@ class WithdrawalController extends AdminBaseController{ | @@ -52,7 +52,7 @@ class WithdrawalController extends AdminBaseController{ | ||
| 52 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; | 52 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; |
| 53 | } | 53 | } |
| 54 | if(!empty($param['keyword'])){ | 54 | if(!empty($param['keyword'])){ |
| 55 | - $where['b.phone'] = ['like','%'.$param['keyword'].'%']; | 55 | + $where['b.phone'] = ['like','%'.trim($param['keyword']).'%']; |
| 56 | } | 56 | } |
| 57 | $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); | 57 | $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); |
| 58 | $data_arr = $data -> toArray(); | 58 | $data_arr = $data -> toArray(); |
| @@ -64,7 +64,7 @@ class WithdrawalController extends AdminBaseController{ | @@ -64,7 +64,7 @@ class WithdrawalController extends AdminBaseController{ | ||
| 64 | } | 64 | } |
| 65 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 65 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
| 66 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 66 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
| 67 | - $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | 67 | + $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
| 68 | $this -> assign('data_arr',$data_arr['data']); | 68 | $this -> assign('data_arr',$data_arr['data']); |
| 69 | $this -> assign('data',$data); | 69 | $this -> assign('data',$data); |
| 70 | return $this -> fetch(); | 70 | return $this -> fetch(); |
-
请 注册 或 登录 后发表评论