From f46240a5eb5fd0d054b9211b3d02b1d5b78ed573 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 12 Dec 2014 09:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=A6=E5=8F=B7=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/zipdown_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index d4699b6c4..2be4e78bb 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -44,7 +44,7 @@ class ZipdownController < ApplicationController
       if homework != nil
         unless homework.attachments.empty?
           zipfile = zip_homework_by_user homework
-          send_file zipfile, :filename =>  (homework.user.user_extensions.student_id.nil? ? "" : homework.user.user_extensions.student_id) +
+          send_file zipfile, :filename =>  (homework.user.user_extensions.nil? ? "" : homework.user.user_extensions.student_id) +
               "_" + (homework.user.lastname.nil? ? "" : homework.user.lastname) + (homework.user.firstname.nil? ? "" : homework.user.firstname) +
               "_" + homework.name + ".zip", :type => detect_content_type(zipfile) if(zipfile)
         else
@@ -80,7 +80,7 @@ class ZipdownController < ApplicationController
     homeattach.attachments.each do |attach|
       homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1)
     end
-    zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{(homework.user.user_extensions.student_id.nil? ? "" : homework.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true)
+    zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{(homework.user.user_extensions.nil? ? "" : homework.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true)
   end