From 74851b7410ce31fdc9bf235ac57279d1580c3d74 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 28 Feb 2020 10:04:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E8=AE=BF=E9=97=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/course.rb b/app/models/course.rb
index cbd09048f..38769ba07 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -257,7 +257,7 @@ class Course < ApplicationRecord
 
   # 老师负责的分班id
   def charge_group_ids user
-    member = user.is_a?(CourseMember) ? user : course_member(user.id)
+    member = user.is_a?(CourseMember) ? user : course_member(user&.id)
     group_ids = if member.present?
                   member.teacher_course_groups.size > 0 ? member.teacher_course_groups.pluck(:course_group_id) : course_groups.pluck(:id)
                 elsif user.admin_or_business?

From 022751735bf26804e5f8ce657c5d3ec07ab8d64f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 28 Feb 2020 10:08:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E8=AE=BF=E9=97=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_commons/index.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/homework_commons/index.json.jbuilder b/app/views/homework_commons/index.json.jbuilder
index 44eabe06d..e47c40745 100644
--- a/app/views/homework_commons/index.json.jbuilder
+++ b/app/views/homework_commons/index.json.jbuilder
@@ -25,8 +25,8 @@ json.homeworks @homework_commons.each do |homework|
   json.upper_category_name homework.course_second_category&.name unless params[:category]
 
   charge_ids = @course.charge_group_ids(@member)
-  json.publish_immediately @user_course_identity < Course::STUDENT && homework.publish_immediately(charge_ids)
-  json.end_immediately @user_course_identity < Course::STUDENT && homework.end_immediately(charge_ids)
+  json.publish_immediately @user.logged? && @user_course_identity < Course::STUDENT && homework.publish_immediately(charge_ids)
+  json.end_immediately @user.logged? && @user_course_identity < Course::STUDENT && homework.end_immediately(charge_ids)
 
   unless curr_status[:status].include?("未发布")
     work_count = calculate_work_count homework, @member

From ea8aeafdb7fe8f84132cbe0303bf049671baf509 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 28 Feb 2020 10:09:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E8=AE=BF=E9=97=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/course.rb b/app/models/course.rb
index 38769ba07..f7db61995 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -260,7 +260,7 @@ class Course < ApplicationRecord
     member = user.is_a?(CourseMember) ? user : course_member(user&.id)
     group_ids = if member.present?
                   member.teacher_course_groups.size > 0 ? member.teacher_course_groups.pluck(:course_group_id) : course_groups.pluck(:id)
-                elsif user.admin_or_business?
+                elsif user&.admin_or_business?
                   course_groups.pluck(:id)
                 else
                   []