From 3499ffd6269d8934406b53e8f8d3a9b139c15a4e Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 8 Apr 2019 18:33:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 21b22de2..7258b076 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -685,7 +685,7 @@ class AccountController < ApplicationController else code = VerificationCode.where(:email => params[:phone], :code => params[:code], :code_type => params[:type].to_i).last end - + req[:valid] = !code.nil? && (Time.now.to_i - code.created_at.to_i) <= 10*60 end render :json => req end From 4f9d8180118aa183bdb308e70ae6057c62e0cb4d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 8 Apr 2019 19:03:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index e04c183b..b7e1bd56 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -4153,7 +4153,7 @@ end sheet1.row(0).default_format = blue sheet1.row(0).concat(["用户姓名","性别","职业","职称","地区"," 单位","子单位","注册时间","最后登录时间","授权"]) count_row = 1 - users.find_each do |user| + users.each do |user| sheet1[count_row,0] = user.try(:show_real_name) sheet1[count_row,1] = user.sex sheet1[count_row,2] = user.user_extensions.try(:show_identity)