diff --git a/app/portal/controller/OrderSalesmanController.php b/app/portal/controller/OrderSalesmanController.php index 0ac8024..3ebc088 100644 --- a/app/portal/controller/OrderSalesmanController.php +++ b/app/portal/controller/OrderSalesmanController.php @@ -75,7 +75,9 @@ class OrderSalesmanController extends WeChatBaseController $where['school'] = ['eq',$param['school']]; } if(!empty($param['grade'])){ - $where['grade'] = ['eq',$param['grade']]; + $param['grade'] = explode('—',$param['grade']); + $where['grade'] = ['eq',$param['grade'][0]]; + $where['class'] = ['eq',$param['grade'][1]]; } if(!empty($param['state'])){ $where['state'] = ['eq',$param['state']]; diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php index 63af8d9..35153d9 100644 --- a/simplewind/cmf/controller/WeChatBaseController.php +++ b/simplewind/cmf/controller/WeChatBaseController.php @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController */ public function checkWeChatUserLogin() { -// $user = Db::name('user')->where('id',4)->find(); -// cmf_update_current_user($user); + $user = Db::name('user')->where('id',5)->find(); + cmf_update_current_user($user); $userId = cmf_get_current_user_id(); if (empty($userId)) { $config = [