diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 07c51477d..13cf8b20f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3066,3 +3066,18 @@ def course_boards_url_in_org(course_id)
   end
 end
 
+def logout_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/logout"
+  elsif Rails.env.test?
+    return "https://test.forge.trustie.net/logout"
+  else
+    return "https://www.trustie.net/logout"
+  end
+end
+
+#判断是否为默认的组织栏目
+def is_default_field? field
+  (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
+end
+
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 2f98e6783..69c355313 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -28,8 +28,4 @@ module OrganizationsHelper
     end
   end
 
-  def is_default_field? field
-    (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
-  end
-
 end
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index e87292e97..88767ba1f 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -68,7 +68,7 @@ class CourseActivity < ActiveRecord::Base
   # 导语要放置在课程创建信息之后
   # 导语
   def add_course_lead
-    if self.course_act_type == "Course"
+    if self.course_act_type == "Course" and Message.where("id=12440").any?
       lead_message = Message.find(12440)
       name = lead_message.subject
       content = lead_message.content
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 20239262f..8ab1851e4 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -100,7 +100,7 @@
           </li>
           <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
           <li>
-            <%= link_to "退出",signout_path,:class => "menuGrey",:method => "post"%>
+            <%= link_to "退出",logout_url_without_domain,:class => "menuGrey",:method => "post"%>
           </li>
         </ul>
       </li>
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index f810dd1d6..4cf707d25 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -46,7 +46,7 @@
           <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
             <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
             <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
-            <%= link_to "退出",(request.local? || request.subdomain.blank?) ? signout_path():"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
+            <%= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>