From 9ad96e39cb96cb402495bcec956caf0e45c073f9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 27 Sep 2019 16:34:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/services/subject_search_service.rb b/app/services/subject_search_service.rb
index 2366cecc2..f69c56c88 100644
--- a/app/services/subject_search_service.rb
+++ b/app/services/subject_search_service.rb
@@ -12,7 +12,7 @@ class SubjectSearchService < ApplicationService
     type = params[:type] || "all"
 
     if type == "mine"
-      @subjects = User.current.shixuns.visible.unhidden
+      @subjects = User.current.subjects.visible.unhidden
     else
       @subjects = Subject.visible.unhidden
     end

From fbb033a0a23d6f7e3c5a8256f9290b01135e5cda Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 27 Sep 2019 16:36:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb
index 4003ffb94..130e7f4b8 100644
--- a/app/decorators/tiding_decorator.rb
+++ b/app/decorators/tiding_decorator.rb
@@ -344,7 +344,7 @@ module TidingDecorator
   end
 
   def resubmit_student_work_content
-    I18n.t(locale_format) % container&.homework_common.try(:name)
+    I18n.t(locale_format) % parent_container.try(:name)
   end
 
   def student_works_score_content