pc

application/api/controller/User.php

@@ -368,10 +368,6 @@ class User extends Api
             if($user['status']=='hidden'){
                 $this->error('用户被禁用');
             }
-            if(!empty($returnData['unionid'])){
-                $user['unionid']=$returnData['unionid'];
-                $user->save();
-            }
             $this->auth->direct($user['id']);
             UserLoginRange::addRange($this->auth->getUser());
             $info['user']=$this->auth->getUserinfo();

application/common/service/WxOpenService.php

@@ -49,8 +49,11 @@ class WxOpenService{
                 if($user){
                     if(!$user['openid']){
                         $user['openid']=$arr['openid'];
-                        $user->save();
                     }
+                    if(!$user['unionid']){
+                        $user['unionid']=$arr['unionid']??null;
+                    }
+                    $user->save();
                 }
             }
             elseif($e==1){