From 4b8624a3c2e1f348dff7ed2e8b15562aed1393d3 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 11 Sep 2024 09:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=97=B6=E6=88=90=E7=BB=A9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ClassEntityServiceImpl.java   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index 5a7ad8ed..cf4e39fb 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -1028,11 +1028,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             questionWrapper.leftJoin(ClassEntity.class,ClassEntity::getModelId,ClassModel::getId);
             questionWrapper.selectAll(ClassTaskAndQuesReply.class);
             questionWrapper.eq(ClassEntity::getId,classEntity.getId());
-            if (params.containsKey("userId")){
-                questionWrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
-            }else {
-                questionWrapper.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId());
-            }
+            questionWrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
             questionWrapper.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId());
             List<ClassTaskAndQuesReply> questionReplys = classTaskAndQuesReplyDao.selectList(questionWrapper);
             if (questionReplys.size() > 0) {
@@ -1051,7 +1047,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             task0wrapper.selectAll(ClassTaskAndQuesReply.class);
             task0wrapper.eq(ClassTask::getClassId,classEntity.getId());
             task0wrapper.eq(ClassTask::getType,"0");
-            task0wrapper.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId());
+            task0wrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
             List<ClassTaskAndQuesReply> task0Replys = classTaskAndQuesReplyDao.selectList(task0wrapper);
             if (task0Replys.size() > 0) {
                 for (ClassTaskAndQuesReply reply : task0Replys) {
@@ -1069,7 +1065,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             task1wrapper.selectAll(ClassTaskAndQuesReply.class);
             task1wrapper.eq(ClassTask::getClassId,classEntity.getId());
             task1wrapper.eq(ClassTask::getType,"1");
-            task1wrapper.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId());
+            task1wrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
             List<ClassTaskAndQuesReply> task1Replys = classTaskAndQuesReplyDao.selectList(task1wrapper);
             if (task1Replys.size() > 0) {
                 for (ClassTaskAndQuesReply reply : task1Replys) {
@@ -1083,7 +1079,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         if (classModel.getIsExperience()==1){
             double experienceScore = 0;
             MPJLambdaWrapper<ClassTask> experiencewrapper = new MPJLambdaWrapper<>();
-            experiencewrapper.eq(ClassTask::getUserId,ShiroUtils.getUId());
+            experiencewrapper.eq(ClassTask::getUserId,params.get("userId"));
             experiencewrapper.eq(ClassTask::getClassId,classEntity.getId());
             experiencewrapper.eq(ClassTask::getType,"2");
             List<ClassTask> experiences = classTaskDao.selectList(experiencewrapper);
@@ -1206,11 +1202,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             Collections.sort(resultList, new Comparator<Map<String,Object>>() {
                 @Override
                 public int compare(Map<String,Object> m1, Map<String,Object> m2) {
-                    if((double)(m2.get("userScore")) > (double)(m1.get("userScore"))){
-                        return 1;
-                    }else {
-                        return -1;
-                    }
+                    return ((BigDecimal)m2.get("userScore")).compareTo((BigDecimal)m1.get("userScore"));
                 }
             });
         }