From 836c91e70b0cdbbbf85afa234869d36d79d13618 Mon Sep 17 00:00:00 2001
From: gaohan <1910974473@qq.com>
Date: Thu, 16 May 2024 15:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=9E=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/CourseController.java   |  4 ++--
 .../platform/operate/web/facade/CourseFacade.java  | 24 ++++++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java
index 8616260..5448881 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java
@@ -411,7 +411,7 @@ public class CourseController extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = "/reviewAdd")
     @ResponseBody
     public BaseResponse reviewAdd(@RequestBody ReviewModel reviewModel, HttpServletRequest request) {
-        return courseFacade.reviewAdd(reviewModel,getUserId(request));
+        return courseFacade.reviewAdd(reviewModel);
     }
 
     /*
@@ -420,7 +420,7 @@ public class CourseController extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = "/reviewAddContent")
     @ResponseBody
     public BaseResponse reviewAddContent(@RequestBody ReviewModel reviewModel, HttpServletRequest request) {
-        return courseFacade.reviewAddContent(reviewModel,getUserId(request));
+        return courseFacade.reviewAddContent(reviewModel);
     }
 
     /*
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
index de9b963..fe4be45 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
@@ -1307,16 +1307,13 @@ public class CourseFacade {
         return objectResponse;
     }
 
-    public BaseResponse reviewAdd(ReviewModel reviewModel, Integer userId) {
+    public BaseResponse reviewAdd(ReviewModel reviewModel) {
         BaseResponse objectResponse = new BaseResponse();
         Date day=new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = df.format(day);
         reviewModel.setCreateDate(format);
         reviewModel.setYn(YnEnums.YES.getId());
-        //操作人为当前用户id
-        reviewModel.setReviewId(userId.toString());
-
 
         courseEvalService.reviewAdd(reviewModel);
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
@@ -1324,7 +1321,7 @@ public class CourseFacade {
         return objectResponse;
     }
 
-    public BaseResponse reviewAddContent(ReviewModel reviewModel, Integer userId) {
+    public BaseResponse reviewAddContent(ReviewModel reviewModel) {
         BaseResponse objectResponse = new BaseResponse();
         Date day=new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1332,7 +1329,6 @@ public class CourseFacade {
         reviewModel.setCreateDate(format);
         reviewModel.setYn(YnEnums.YES.getId());
         //操作人为当前用户id
-        reviewModel.setReviewId(userId.toString());
         reviewModel.setParentId(reviewModel.getParentId());
 
 
@@ -1357,13 +1353,15 @@ public class CourseFacade {
 
         List<ReviewModel> matchingModels = new ArrayList<>(); // 创建用于存放匹配数据的新集合
 
-        if (!models.isEmpty()) {
-            matchingModels.add(models.get(0)); // 将models集合中的第一条数据添加到匹配集合中
-        }
-
-        if (!models1.isEmpty()) {
-            int index = models1.size() > 1 ? 1 : 0; // 如果models1集合中有多个数据，则获取第二条数据，否则获取第一条数据
-            matchingModels.add(models1.get(index)); // 将models1集合中的数据添加到匹配集合中
+        for (ReviewModel model : models) {
+            String ids = model.getId(); // 获取models中的ID
+            for (ReviewModel model1 : models1) {
+                if (model1.getParentId() == ids) { // 在models1中查找匹配的parentId
+                    matchingModels.add(model); // 将对应的models数据添加到匹配集合中
+                    matchingModels.add(model1); // 将对应的models1数据添加到匹配集合中
+                    break; // 找到匹配数据后跳出内层循环
+                }
+            }
         }
 
 
-- 
1.8.3.1