Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

5 years ago · 30aa0ac79b
parent 541383ad0c fd3790b451
commit 30aa0ac79b
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/gits_controller.rb
+++ b/app/controllers/gits_controller.rb
@ -32,7 +32,7 @@ class GitsController < ApplicationController
        system_user = User.find_by_login(input_username) || User.find_by_mail(input_username) || User.find_by_phone(input_username)

        # 如果用户名密码错误
-        if !system_user.check_password?(input_password)
+        if system_user && !system_user.check_password?(input_password)
          uid_logger_error("git start: password is wrong")
          result = false
        else