Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/UserController.php

@@ -193,10 +193,9 @@ class UserController extends AbstractController
      * 获取用户信息
      * @return array|void
      */
-    public function getUserInfo()
+    public function getUserInfo($id)
     {
-        var_dump(Context::get("UserId"), '---------1-----');
-        $result =  $this->userServiceClient->getUserInfo((int)Context::get("UserId"));
+        $result =  $this->userServiceClient->getUserInfo($id!=''?$id:(int)Context::get("UserId"));
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
         }

app/Middleware/Auth/FooMiddleware.php

@@ -87,7 +87,7 @@ class FooMiddleware implements MiddlewareInterface
                     Context::set("SiteId",$result['data']['id']);
                     if($ver['type_id']!=10000){
                         $userInfo = $this->userController->getUserInfo($ver['uid']);
-                        if($userInfo['code']!=200 && !isset($userInfo['data']) && !empty($userInfo['data']['sszq'])){
+                        if($userInfo['code'] == 200 && isset($userInfo['data']) && !empty($userInfo['data']['sszq'])){
                             $sszq = $userInfo['data']['sszq'];
                             //组id
                             $authData = [