Browse Source

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

wugg 2 years ago
parent
commit
64ecca73ec
1 changed files with 17 additions and 10 deletions
  1. 17 10
      app/admin/controller/Consult.php

+ 17 - 10
app/admin/controller/Consult.php

@@ -1368,16 +1368,16 @@ class Consult extends Base
             $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];
+//        $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;
@@ -1448,7 +1448,14 @@ class Consult extends Base
         if($token==''){
             return error_show(102,"参数token不能为空");
         }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(105,"用户数据不存在");
+//        }
 
+//        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+//        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+//        $where[] = ["createrid","=",$createrid];
         $list =Db::name('consult_bids')->where($where)->select();
         $data=[];
         foreach ($list as $value){