From 8a7c12b0cbd19e5f264f66b3999ac2da3fbc6435 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 4 Oct 2022 16:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=A2=98=E7=9B=AE=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TeacherOpenCourseQuestionLogService.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
index a21ec8ad..57e94e89 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -5,7 +5,6 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
@@ -31,7 +30,6 @@ import javax.validation.constraints.NotEmpty;
 import java.util.*;
 
 import static cn.hutool.core.util.ArrayUtil.join;
-import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId;
 import static com.ibeetl.jlw.entity.ResourcesQuestionOptionEntity.shuffleOrderOptions;
 import static java.util.stream.Collectors.groupingBy;
@@ -174,8 +172,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
     public void addQuestionLog(Map<Long, TreeSet<String>> questionLogMap, final ResourcesQuestionSnapshotFromTypeEnum fromType) {
 
         // 查询学生身份
-        final CoreUser user = getUser();
-        final Student student = studentDao.getByUserId(user.getId());
+        final Student student = studentDao.getByUserId(getUserId());
 
         ResourcesQuestionSnapshot entity = new ResourcesQuestionSnapshot();
         entity.setResourcesQuestionSnapshotId(CollectionUtils.firstElement(questionLogMap.keySet()));
@@ -192,8 +189,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
             questionLog.setTeacherOpenCourseQuestionLogFromType(fromType);
             questionLog.setTeacherOpenCourseQuestionLogFromId(resourcesQuestionSnapshot.getResourcesQuestionSnapshotFromId());
             questionLog.setTeacherOpenCourseQuestionLogStatus(1);
-            questionLog.setOrgId(user.getOrgId());
-            questionLog.setUserId(user.getId());
+            questionLog.setOrgId(student.getOrgId());
+            questionLog.setUserId(student.getUserId());
             // 包含/字符，代表是路径地址，是附件类型
             if(answersText.contains("/")) {
                 questionLog.setTeacherOpenCourseQuestionLogUploadFile(answersText);
@@ -205,6 +202,9 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
             questionLog.setTeacherOpenCourseQuestionLogAddTime(new Date());
             questionLog.setResourcesQuestionSnapshotId(resourcesQuestionSnapshotId);
             questionLog.setStudentId(student.getStudentId());
+            // 用于数据权限
+            questionLog.setOrgId(student.getOrgId());
+            questionLog.setUserId(student.getUserId());
             list.add(questionLog);
         });