From 972fd5fe3db1d29a5c6905a609ebeb0e2ae4e055 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Mon, 29 Jul 2019 08:48:42 +0800
Subject: [PATCH 1/3] fix ec teample download bug

---
 app/controllers/ec_years_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/ec_years_controller.rb b/app/controllers/ec_years_controller.rb
index 6baf5d58..5e9063f1 100644
--- a/app/controllers/ec_years_controller.rb
+++ b/app/controllers/ec_years_controller.rb
@@ -239,7 +239,7 @@ class EcYearsController < ApplicationController
     template_file = EcTemplate.find_by_name "课程列表导入模板"
     if template_file.present?
       file = template_file.attachments.first
-      @file_url = '' #"/attachments/download/#{file.id}/#{file.filename}"
+      @file_url = "/attachments/download/#{file.id}/#{file.filename}"
     else
       @file_url = "javascript:void(0);"
     end

From 61962d7710d8f9f82cde0c9640c91a037885ef15 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 29 Jul 2019 09:26:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ecs_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/ecs_controller.rb b/app/controllers/ecs_controller.rb
index 12b6b5d9..943d6d40 100644
--- a/app/controllers/ecs_controller.rb
+++ b/app/controllers/ecs_controller.rb
@@ -58,8 +58,7 @@ class EcsController < ApplicationController
   # 获取工程认证头部url
   # GET: /ecs/get_navigation_url
   def get_navigation_url
-    ec_user = EcSchoolUser.where(:user_id => User.current.id).first
-    ec_url = "#{department_ecs_path(:school_id => ec_user.school_id)}" if ec_user
+    ec_url = "#{department_ecs_path(:school_id => User.current.ec_school)}" if  User.current.ec_school.present?
     render :json => {ec_url: ec_url, project_packages_url: "/crowdsourcing"  }
   end
 

From e9e966dd9bc3b0fcea3f366612e162d7d56cb019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 29 Jul 2019 09:32:03 +0800
Subject: [PATCH 3/3] =?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/tpm/NewHeader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index af2b7fb6..6d521f3a 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -404,13 +404,13 @@ class NewHeader extends Component {
 						<style>
 							{
 								`
-								.mar55{
-									margin-right: 55px;
+								.marf28{
+								    margin-right: -28px;
 								}
 								`
 							}
 						</style>
-				    <div className="posi-search mar55" id="posi-search" style={{display: 'none'}}>
+				    <div className="posi-search marf28" id="posi-search" style={{display: 'none'}}>
 				        <div className="search-all clearfix">
 				          {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
 				          	<div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}>