From 1b06a41af6c9266db944c914181911ce8854624c Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 20 May 2025 15:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E6=A1=88=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ClassEntityServiceImpl.java  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 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 dc1b307f..8257bd2a 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
@@ -1148,11 +1148,21 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                 if (quesReplys > 0){
                     info += "思考题";
                 }
-                int task1Replys = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
+                List<ClassTask> task1s = classTaskDao.selectList(new LambdaQueryWrapper<ClassTask>()
                         .eq(ClassTask::getClassId,cu.getClassId())
-                        .eq(ClassTask::getType,1)
-                        .notLike(ClassTask::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
-                if (task1Replys > 0){
+                        .eq(ClassTask::getType,1));
+                boolean flag = false;
+                for (ClassTask ct:task1s){
+                    int task1Replys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
+                            .eq(ClassTaskAndQuesReply::getType,0)
+                            .eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
+                            .eq(ClassTaskAndQuesReply::getRelationId,ct.getId())
+                            .notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
+                    if (task1Replys > 0){
+                        flag = true;
+                    }
+                }
+                if (flag){
                     info += "医案";
                 }
                 int expReplys = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
@@ -1468,8 +1478,11 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             for (ClassUser classUser:classUsers){
                 params.put("userId",classUser.getUserId());
                 Map<String, Object> map = getUserScore(params);
-                map.put("user",myUserDao.selectById(classUser.getUserId()));
-                resultList.add(map);
+                MyUserEntity userEntity = myUserDao.selectById(classUser.getUserId());
+                if (userEntity!=null){
+                    map.put("user",userEntity);
+                    resultList.add(map);
+                }
             }
             Collections.sort(resultList, new Comparator<Map<String,Object>>() {
                 @Override