Merge branch 'standalone_develop' into pre_trustie_server

app/controllers/users_controller.rb

@@ -350,7 +350,10 @@ class UsersController < ApplicationController
 
         # 没有用户时，新建用户并登录
         user = User.where("login = ?  or phone = ? or mail = ? ", "#{login}", phone, email).first
-        unless user
+        if user.present?
+          # 手机号先记录，后续用
+          user.update_column(:phone, "#{phone}") if phone.present?
+        else
           ActiveRecord::Base.transaction do
             phone_rand = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9].sample(4).join
             user_params = { status: 1, type: 'User', login: "#{login}", lastname: "#{real_name}", mail: "#{email}",