Merge branch 'wugg' of wugg/phpstock into version1.5

app/admin/controller/Base.php

@@ -9,6 +9,7 @@ use think\App;
 class Base extends \app\BaseController
 {
     public  $post=[];
+    public  $uid='';
     public function __construct(App $app)
     {
         parent::__construct($app);
@@ -26,6 +27,6 @@ class Base extends \app\BaseController
         if(!empty($effetc) && $effetc['code']!=0) {
             return error_show($effetc['code'], $effetc['message']);
         }
-        // TODO: Change the autogenerated stub
+
     }
 }

app/admin/controller/Consult.php

@@ -1367,6 +1367,17 @@ class Consult extends Base
             ("zxNo");
             $where[] = ['zxNo','in',$zxlist];
         }
+
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $apply_id =GetUserInfo($token);
+        if(empty($apply_id)||$apply_id['code']!=0){
+            return error_show(1002,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        $where[]=['createrid',"=",$rm];
         $count = Db::name('consult_bids')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;