From 8785f1f966e162b2543f796b21e604b239167be5 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 19 Dec 2019 10:43:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E9=87=8D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 8a1c07ddf..7cbc7116c 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -1497,7 +1497,7 @@ class HomeworkCommonsController < ApplicationController
     @user = @student_work.user
     tip_exception("当前用户无作品可以显示") if @student_work.nil?
     # 查询最新一次的查重标识query_id
-    group_id = @course.course_members.where(user_id: params[:user_id]).pluck(:course_group_id).first
+    group_id = @course.students.where(user_id: params[:user_id]).pluck(:course_group_id).first
     query_id = @homework.homework_group_reviews.where(:course_group_id => group_id).last.try(:query_id)
     results = ReviewService.query_result({user_id: params[:user_id], query_id: query_id})
     @shixun = @homework.shixuns.take

From 3a71ee90e7a53363ce8f47981858b0558fe2e5af Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 19 Dec 2019 10:47:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E9=87=8D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 7cbc7116c..b53c08779 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -1499,6 +1499,7 @@ class HomeworkCommonsController < ApplicationController
     # 查询最新一次的查重标识query_id
     group_id = @course.students.where(user_id: params[:user_id]).pluck(:course_group_id).first
     query_id = @homework.homework_group_reviews.where(:course_group_id => group_id).last.try(:query_id)
+    Rails.logger.info("##################------query_id: #{query_id}")
     results = ReviewService.query_result({user_id: params[:user_id], query_id: query_id})
     @shixun = @homework.shixuns.take
     if results.status == 0

From 7d8e5fc9a89b8ee5213828a7bb21b36427abc3bd Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 19 Dec 2019 11:03:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E9=87=8D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index b53c08779..b421cbb56 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -1498,8 +1498,11 @@ class HomeworkCommonsController < ApplicationController
     tip_exception("当前用户无作品可以显示") if @student_work.nil?
     # 查询最新一次的查重标识query_id
     group_id = @course.students.where(user_id: params[:user_id]).pluck(:course_group_id).first
-    query_id = @homework.homework_group_reviews.where(:course_group_id => group_id).last.try(:query_id)
+    homework_group_review = @homework.homework_group_reviews.where(:course_group_id => group_id).last || @homework.homework_group_reviews.last
+    query_id = homework_group_review.try(:query_id)
     Rails.logger.info("##################------query_id: #{query_id}")
+    tip_exception(-1, "query_id有误") unless query_id.present?
+
     results = ReviewService.query_result({user_id: params[:user_id], query_id: query_id})
     @shixun = @homework.shixuns.take
     if results.status == 0