From fb59e6115f95dafe93944109cfde31df60042339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 15 Oct 2019 10:15:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/boards/BoardsNew.js        | 3 ++-
 public/react/src/modules/courses/boards/TopicDetail.js      | 6 ++++--
 .../src/modules/courses/busyWork/CommonWorkAppraise.js      | 2 ++
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js   | 1 +
 public/react/src/modules/courses/busyWork/NewWork.js        | 4 ++--
 public/react/src/modules/courses/exercise/ExerciseNew.js    | 5 +++--
 .../src/modules/courses/exercise/ExerciseReviewAndAnswer.js | 1 +
 .../modules/courses/exercise/Testpapersettinghomepage.js    | 2 +-
 .../courses/graduation/tasks/GraduationTaskDetail.js        | 2 ++
 .../courses/graduation/tasks/GraduationTasksSubmitedit.js   | 2 +-
 .../courses/graduation/tasks/GraduationTasksSubmitnew.js    | 4 ++--
 .../courses/graduation/tasks/GraduationTasksappraise.js     | 2 ++
 .../modules/courses/graduation/tasks/GraduationTasksedit.js | 2 +-
 .../modules/courses/graduation/tasks/GraduationTasksnew.js  | 1 +
 .../courses/graduation/topics/GraduateTopicDetail.js        | 2 +-
 .../modules/courses/graduation/topics/GraduateTopicNew.js   | 1 +
 public/react/src/modules/courses/poll/PollDetailIndex.js    | 1 +
 public/react/src/modules/courses/poll/PollInfo.js           | 1 +
 public/react/src/modules/courses/poll/PollNew.js            | 1 +
 .../src/modules/courses/shixunHomework/ShixunWorkDetails.js | 1 +
 .../src/modules/courses/shixunHomework/ShixunWorkReport.js  | 2 +-
 21 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index 22a5fece1..9ae74699f 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -287,7 +287,8 @@ class BoardsNew extends Component{
     const isAdmin = this.props.isAdmin()
     const courseId=this.props.match.params.coursesId;
     const boardId = this.props.match.params.boardId
-    const isCourseEnd = this.props.isCourseEnd()
+    const isCourseEnd = this.props.isCourseEnd();
+		document.title=this.props.coursedata&&this.props.coursedata.name;
     return(
         <div className="newMain ">
           <AddDirModal {...this.props}
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 8ecc85565..d42b68c17 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -526,8 +526,10 @@ class TopicDetail extends Component {
       const isAdmin = this.props.isAdmin()
       // TODO 图片上传地址
       const courseId=this.props.match.params.coursesId;
-      const boardId = this.props.match.params.boardId
-      const isCourseEnd = this.props.isCourseEnd()
+      const boardId = this.props.match.params.boardId;
+      const isCourseEnd = this.props.isCourseEnd();
+
+			document.title=this.props.coursedata&&this.props.coursedata.name;
 	    return (
         <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
           <style>{`
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index f41528657..61469c6bd 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -171,6 +171,8 @@ class CommonWorkAppraise extends Component{
     let category_id=this.props.match.params.category_id;
     let studentWorkId=this.props.match.params.studentWorkId;
     const isAdmin = this.props.isAdmin()
+
+		document.title=course_name&&course_name;
     return(
       <WorkDetailPageHeader 
         {...this.props} {...this.state}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 7ba231b99..86b17e802 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -225,6 +225,7 @@ class CommonWorkDetailIndex extends Component{
     // console.log(params);
     let exportUrl = `/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`
     let exportResultUrl = `/homework_commons/${workId}/works_list.xlsx?${queryString.stringify(params)}`
+		document.title=course_name === undefined ? "" : course_name;
     return (
         <div>
           <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index e11eca9e2..37e71d168 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -161,8 +161,8 @@ class NewWork extends Component{
 			doNew: this.doNew,
 			doEdit: this.doEdit,
 		}
-
-		return(
+	  document.title=this.state.course_name && this.state.course_name
+	 	return(
 			<div className="newMain">
 				<div className="educontent mt20 mb50">
 					<CBreadcrumb items={[
diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index 80f837686..0c2542569 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -57,8 +57,9 @@ class ExerciceNew extends Component{
     
     const courseId=this.props.match.params.coursesId;
 
-    const isEdit = this.isEdit
-    
+    const isEdit = this.isEdit;
+
+		document.title=this.props.coursedata&&this.props.coursedata.name;
     return(
         <div className="newMain exerciseNew">
         
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 75da4f2fe..2eaf03b92 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -612,6 +612,7 @@ class ExerciseReviewAndAnswer extends Component{
     let isStudent =this.props.isStudent();
     const { current_user } = this.props
     // console.log(data&&data.exercise.user_name)
+		document.title=courseName&&courseName.name;
     return(
       <div className="newMain" style={{paddingTop:"0px"}}>
         <Spin size="large" spinning={isSpin}>
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index d878eb872..6c7a35058 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -271,7 +271,7 @@ class Testpapersettinghomepage extends Component{
             // TODO
 
 			// console.log(Commonheadofthetestpaper.exercise_status);
-
+			document.title=this.props.coursedata&&this.props.coursedata.name;
         return(
             <div className="newMain clearfix ">
 								{/*<DownloadMessage*/}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
index 66e4ccb8d..e7924f469 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
@@ -316,6 +316,8 @@ class GraduationTaskDetail extends Component{
 			setTab:this.setTab,
 			getdatas:this.getdatas
 		}
+
+		document.title=questionslist&&questionslist.course_name;
 		return(
 			<div className="newMain clearfix">
 				{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 02e7177fa..bf371baab 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -537,7 +537,7 @@ class GraduationTasksSubmitedit extends Component{
       },
     };
 
-
+		document.title=workslist&&workslist.course_name;
     return(
       <React.Fragment>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 698ab5c97..140d743b9 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -560,10 +560,10 @@ render(){
     },
   };
 
-  console.log(this.props)
-
+  // console.log(this.props)
 
 
+	document.title=workslist&&workslist.course_name;
   return(
 <React.Fragment>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index f0bead58f..2f9b28ef5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -146,6 +146,8 @@ class GraduationTasksappraise extends Component{
     let graduation_id=datalist===undefined?"":datalist.graduation_id;
     let task_id=datalist===undefined?"":datalist.task_id;
     // console.log(datalist);
+
+		document.title=datalist&&datalist.course_name;
     return(
       <React.Fragment>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 962edcde5..8b480258d 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -328,7 +328,7 @@ class GraduationTasksedit extends Component{
     };
 
 
-
+		document.title=this.props.current_user&&this.props.current_user.course_name;
     return(
       <React.Fragment>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 84b9b096b..5358bfe9e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -313,6 +313,7 @@ class GraduationTasksnew extends Component {
 		};
 		// this.ifHasAnchorJustScorll();
 		// console.log(this.props.current_user.course_name)
+		document.title=this.props.current_user&&this.props.current_user.course_name;
 		return (
 			<React.Fragment>
 
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index 65b093d2b..b4bcaf0fa 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -100,7 +100,7 @@ class GraduateTopicDetail extends Component{
     let {course_id,graduation_topic_id}=this.props.match.params;
     const isStudent =this.props.isStudent();
     const isAdmin =this.props.isAdmin();
-
+		document.title=tableData && tableData.course_name;
     return(
       <div className="newMain">
         <div className="educontent mt10 mb50">
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index ba2ab53d9..b086efeda 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -323,6 +323,7 @@ class GraduateTopicNew extends Component{
     };
     // console.log("dfsf");
     // console.log(this.props);
+	  document.title=course_name===undefined?"":course_name;
     return(
         <div className="newMain ">
           <style>{`
diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js
index e92a0e352..cd3d4448a 100644
--- a/public/react/src/modules/courses/poll/PollDetailIndex.js
+++ b/public/react/src/modules/courses/poll/PollDetailIndex.js
@@ -115,6 +115,7 @@ class PollDetailIndex extends Component{
 		const { current_user } = this.props;
 		const isAdmin =this.props.isAdmin();
 		const isStudent = this.props.isStudent();
+		document.title=this.props.coursedata&&this.props.coursedata.name;
 		return(
 			<div className="newMain">
 				<DownloadMessageysl
diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js
index bb019c4a4..b7d0a59dd 100644
--- a/public/react/src/modules/courses/poll/PollInfo.js
+++ b/public/react/src/modules/courses/poll/PollInfo.js
@@ -301,6 +301,7 @@ class PollInfo extends Component{
 		const { current_user } = this.props
     let isAdmin=this.props.isAdmin();
     let isStudent=this.props.isStudent();
+		document.title=courseName&&courseName;
     return(
       <div className="newMain" style={{paddingTop:"0px"}}>
         {/*<p style={{height:"60px"}}></p>*/}
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 5aa7f8f72..10a9b00c7 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2765,6 +2765,7 @@ class PollNew extends Component {
 
 		// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
 		var displaymysave = (mysave === true) ? "" : "display:none;";
+		document.title=this.props.coursedata&&this.props.coursedata.name;
 		return (
 			<div className="newMain">
 				{/*提示*/}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
index 8254b148e..7cdab81a6 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
@@ -95,6 +95,7 @@ class ShixunWorkDetails extends Component {
 	}
 	render() {
     let{data}=this.state;
+		document.title=data&&data.course_name;
 		return (
 			<Spin size="large" spinning={this.state.spinning} style={{marginTop:"13%"}}>
 				<div className="newMain clearfix ">
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 2667f1dd9..88682c5a6 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -310,7 +310,7 @@ class ShixunWorkReport extends Component {
 
 		// let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
 		let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
-
+		document.title=data&&data.course_name;
 		return (
 
 				data===undefined?"":<Spin indicator={antIcon} spinning={this.state.spinning}>

From 81eb1d7e081327658e70a1cba363f2897136a83b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 15 Oct 2019 10:34:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 4 ++--
 app/models/homework_group_setting.rb           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 83b80bec4..bdcc3c96d 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -482,7 +482,7 @@ class HomeworkCommonsController < ApplicationController
 
               publish_time = setting[:publish_time] == "" ? Time.now : setting[:publish_time]
               # 截止时间为空时取发布时间后一个月
-              end_time = setting[:end_time] == "" ? Time.at(publish_time.to_time.to_i+30*24*3600) : setting[:end_time]
+              end_time = setting[:end_time]
               HomeworkGroupSetting.where(homework_common_id: @homework.id, course_group_id: setting[:group_id]).
                   update_all(publish_time: publish_time, end_time: end_time)
               setting_group_ids << setting[:group_id]
@@ -1170,7 +1170,7 @@ class HomeworkCommonsController < ApplicationController
       # 可立即截止的分班：统一设置则是用户管理的所有分班，否则是当前用户管理的分班中已发布且未截止的
       charge_group_ids = @course.charge_group_ids(@current_user)  # 当前用户管理的分班
       group_ids = @homework.unified_setting ? charge_group_ids :
-                      @homework.homework_group_settings.where(course_group_id: charge_group_ids).none_end.pluck(:course_group_id)
+                      @homework.homework_group_settings.where(course_group_id: charge_group_ids).published_no_end.pluck(:course_group_id)
       @course_groups = @course.course_groups.where(id: group_ids)
     else
       tip_exception("没有可截止的分班")
diff --git a/app/models/homework_group_setting.rb b/app/models/homework_group_setting.rb
index ae9491cb3..7a06d5a7a 100644
--- a/app/models/homework_group_setting.rb
+++ b/app/models/homework_group_setting.rb
@@ -6,6 +6,6 @@ class HomeworkGroupSetting < ApplicationRecord
   scope :none_published, -> {where("homework_group_settings.publish_time IS NULL OR homework_group_settings.publish_time > ?", Time.now)}
   scope :published_no_end, -> {where("homework_group_settings.publish_time IS NOT NULL AND homework_group_settings.publish_time < ?
                                       and homework_group_settings.end_time > ?", Time.now, Time.now)}
-  scope :none_end, -> {where("homework_group_settings.end_time IS NOT NULL AND homework_group_settings.end_time > ?", Time.now)}
+  scope :none_end, -> {where("homework_group_settings.end_time IS NULL or homework_group_settings.end_time > ?", Time.now)}
 
 end

From 553ec8e010d94e90fba3b92b3b0b3c57cd113123 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 15 Oct 2019 11:27:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 4 ++--
 app/helpers/export_helper.rb                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index bdcc3c96d..84b11814f 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -160,7 +160,7 @@ class HomeworkCommonsController < ApplicationController
 
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
         if params[:work_status].present?
-          work_status = params[:work_status].map{|status| status.to_i}
+          work_status = params[:work_status].split(",").map{|status| status.to_i}
           all_student_works = @student_works.left_joins(:myshixun)
           @student_works = all_student_works.where(work_status: work_status)
 
@@ -170,7 +170,7 @@ class HomeworkCommonsController < ApplicationController
 
         # 分班情况
         unless params[:course_group].blank?
-          group_user_ids = @course.students.where(course_group_id: params[:course_group]).pluck(:user_id)
+          group_user_ids = @course.students.where(course_group_id: params[:course_group].split(",")).pluck(:user_id)
           # 有分组只可能是老师身份查看列表
           @student_works = @student_works.where(user_id: group_user_ids)
         end
diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb
index 28bef0a89..534a78dc1 100644
--- a/app/helpers/export_helper.rb
+++ b/app/helpers/export_helper.rb
@@ -452,7 +452,7 @@ module ExportHelper
       end
     end
 
-    out_file_name = "作品附件_#{homework_common&.course&.name}_#{homework_common.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.zip"
+    out_file_name = "作品附件_#{homework_common.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.zip"
     out_file_name.gsub!(" ", "-")
     out_file_name.gsub!("/", "_")
     out_file = find_or_pack(homework_common, homework_common.user_id, digests.sort){

From 6cb05c62e1eb47da96cc6690c01ff0bd6f82e96b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 15 Oct 2019 11:39:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 84b11814f..adfcef74f 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -160,7 +160,8 @@ class HomeworkCommonsController < ApplicationController
 
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
         if params[:work_status].present?
-          work_status = params[:work_status].split(",").map{|status| status.to_i}
+          params_work_status = request.get? ? params[:work_status].split(",") : params[:work_status]
+          work_status = params_work_status.split(",").map{|status| status.to_i}
           all_student_works = @student_works.left_joins(:myshixun)
           @student_works = all_student_works.where(work_status: work_status)
 
@@ -170,7 +171,8 @@ class HomeworkCommonsController < ApplicationController
 
         # 分班情况
         unless params[:course_group].blank?
-          group_user_ids = @course.students.where(course_group_id: params[:course_group].split(",")).pluck(:user_id)
+          group_ids = request.get? ? params[:course_group].split(",") : params[:course_group]
+          group_user_ids = @course.students.where(course_group_id: group_ids).pluck(:user_id)
           # 有分组只可能是老师身份查看列表
           @student_works = @student_works.where(user_id: group_user_ids)
         end