diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 5259a8d2e..f146e643d 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -89,6 +89,10 @@ class Bulletin
   def bulletin_category_with_title
     self.bulletin_category.title
   end
+  
+  def bulletin_create_dept
+    User.get_member_list_attribute_value(self.create_user_id,"staff","Unit").get_value_by_locale(I18n.locale)
+  end
 
   def share_item
       Item.first(conditions:{name: 'announcement'})
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index 0f60d98e6..1ad1e0d08 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -4,8 +4,8 @@
 	<div class="info1">
 		<span class="pull-right"><%= dislpay_view_count(@bulletin) %></span>
 		<span class="date"><%= display_date_time(@bulletin.postdate) %></span>
-		<% unit =  @bulletin.cache_dept[I18n.locale.to_s] rescue nil %>
-		<span><%=  link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
+		<% unit = User.get_member_list_attribute_value(@bulletin.create_user_id,"staff","Unit").get_value_by_locale(I18n.locale) rescue nil %>
+		<span><%= t('announcement.default_widget.bulletin_create_dept') + ": " + unit unless unit.blank? %></span>
 	</div>
 </div>
 <div class="news_image">
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index b6a747a4e..4795124d2 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -17,6 +17,7 @@ en:
       postdate: Post Date
       title: Title
       subtitle: SubTitle
+      bulletin_create_dept: Unit
     editing_announcement: Edit Announcement
     editing_announcement_category: Edit Category
     error:
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index 7c29cab3d..133c1aae9 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -17,6 +17,7 @@ zh_tw:
       postdate: 張貼日期
       title: 標題
       subtitle: 副標題
+      bulletin_create_dept: 單位
     editing_announcement: 編輯類別
     editing_announcement_category: 編輯類別
     error:
diff --git a/vendor/built_in_modules/announcement/init.rb b/vendor/built_in_modules/announcement/init.rb
index b8f214efc..a3d43b7ca 100644
--- a/vendor/built_in_modules/announcement/init.rb
+++ b/vendor/built_in_modules/announcement/init.rb
@@ -37,6 +37,7 @@ module Announcement
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
         field :subtitle
+        field :bulletin_create_dept
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end
 
diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb
index 29f3610dd..fafab9738 100644
--- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb
+++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb
@@ -11,6 +11,14 @@
 
 			</iframe> 
 
+			<% if @email_er.email_er_files.size > 0 %>
+				<%= label_tag t('file_')%>
+				<% @email_er.email_er_files.each do | efile | %>
+				<%= link_to (!efile.title.blank? ? efile.title : t('download')), efile.file.url, {:target => '_blank', :title => efile.title} if efile.file.file %>
+				<% end %>
+				<br />
+			 <% end %>
+
 			<% if !@email_er.email_group.blank? %>
 				<%= label_tag 'group_mail' %>
 				<%= @email_er.get_email_group_data(@email_group_data) %>
diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/show.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/show.html.erb
index 307b39233..71d7b6eda 100644
--- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/show.html.erb
+++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/show.html.erb
@@ -1 +1,4 @@
- <%= @email_er.mail_content.html_safe %>
\ No newline at end of file
+<ul>
+  <li><%= label_tag t("er_email.mail_subject") %><%= @email_er.mail_subject %></li>
+  <li><%= label_tag t("er_email.mail_content") %><%= @email_er.mail_content.html_safe %></li>
+</ul>
\ No newline at end of file