Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

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

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 => User.current.ec_school)}" if  User.current.ec_school.present?
-    ec_url = "#{department_ecs_path(:school_id => ec_user.school_id)}" if ec_user
     render :json => {ec_url: ec_url, project_packages_url: "/crowdsourcing"  }
   end
 

public/react/src/modules/tpm/NewHeader.js

@@ -404,13 +404,13 @@ class NewHeader extends Component {
 						<style>
 							{
 								`
-								.mar55{
+								.marf28{
-									margin-right: 55px;
+								    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'}}>