From bba4921b6db3f69a6d994b0f735526bfae1b2eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 3 Sep 2019 16:17:18 +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 --- public/react/src/modules/user/LoginRegisterComponent.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index a9e8de797..0b977904a 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -1106,6 +1106,9 @@ class LoginRegisterComponent extends Component { .mymimasysl { border-right: none !important; } + .ant-input-group-addon{ + background-color: #fff;s + } ` } From 3f698f502c86db58e888503eca3e052125f5f864 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Tue, 3 Sep 2019 16:18:49 +0800 Subject: [PATCH 2/2] admins: fix import user --- app/services/admins/import_user_service.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/services/admins/import_user_service.rb b/app/services/admins/import_user_service.rb index a07d29641..f3408051b 100644 --- a/app/services/admins/import_user_service.rb +++ b/app/services/admins/import_user_service.rb @@ -55,7 +55,9 @@ class Admins::ImportUserService < ApplicationService professional_certification: 1, certification: 1, password: '12345678', - phone: data.phone + phone: data.phone, + mail: "#{prefix}#{data.student_id}@qq.com", + profile_completed: true } ActiveRecord::Base.transaction do user = User.create!(attr) @@ -67,8 +69,8 @@ class Admins::ImportUserService < ApplicationService extension_attr[:technical_title] = case data.identity.to_i - when 0 then %w(教授 副教授 讲师 助教).include?(data.technical_title) || '讲师' - when 2 then %w(企业管理者 部门管理者 高级工程师 工程师 助理工程师).include?(data.technical_title) || '助理工程师' + when 0 then %w(教授 副教授 讲师 助教).include?(data.technical_title) ? data.technical_title : '讲师' + when 2 then %w(企业管理者 部门管理者 高级工程师 工程师 助理工程师).include?(data.technical_title) ? data.technical_title : '助理工程师' else nil end