合并分支 'wangxiaogang' 到 'master'

Wangxiaogang



查看合并请求 !91

@@ -75,7 +75,9 @@ class OrderSalesmanController extends WeChatBaseController
             $where['school'] = ['eq',$param['school']];
             $where['school'] = ['eq',$param['school']];
         }
         }
         if(!empty($param['grade'])){
         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'])){
         if(!empty($param['state'])){
             $where['state'] = ['eq',$param['state']];
             $where['state'] = ['eq',$param['state']];

@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-//        $user = Db::name('user')->where('id',4)->find();
+//        $user = Db::name('user')->where('id',5)->find();
 //        cmf_update_current_user($user);
 //        cmf_update_current_user($user);
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {