From e507c6f8764cfa3d605f85fcc5755d331b55567b Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 13 Jan 2025 17:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E8=AF=BE=E5=90=8E=E9=A2=98=E5=8C=BA=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/ClassEntityServiceImpl.java        | 7 +++++++
 1 file changed, 7 insertions(+)

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 abb8ecfa..81326807 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
@@ -795,6 +795,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                     classTaskDao.deleteById(taskTask.getId());
                 }
                 classTaskAndQuesReplyDao.delete(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
+                        .eq(ClassTaskAndQuesReply::getType,0)
                         .eq(ClassTaskAndQuesReply::getRelationId,taskTask.getId())
                         .eq(ClassTaskAndQuesReply::getUserId,params.get("userId")));
             }
@@ -844,6 +845,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     public void delClassTask(Map<String, Object> params) {
         classTaskDao.deleteById(params.get("taskId").toString());
         classTaskAndQuesReplyDao.delete(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
+                .eq(ClassTaskAndQuesReply::getType,0)
                 .eq(ClassTaskAndQuesReply::getRelationId,params.get("taskId")));
     }
 
@@ -976,6 +978,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         ClassTask classTask = classTaskDao.selectById(params.get("taskId").toString());
         classTask.setCreateUser(myUserDao.selectById(classTask.getUserId().toString()));
         int count = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
+                .eq(ClassTaskAndQuesReply::getType,0)
                 .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId())
                 .eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId()));
         if (count > 0) {
@@ -1110,6 +1113,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     public ClassTaskAndQuesReply getQuesReplyInfo(Map<String, Object> params) {
         ClassTaskAndQuesReply classTaskAndQuesReply = classTaskAndQuesReplyDao.selectOne(
                 new LambdaQueryWrapper<ClassTaskAndQuesReply>()
+                .eq(ClassTaskAndQuesReply::getType,1)
                 .eq(ClassTaskAndQuesReply::getRelationId,params.get("relationId").toString())
                 .eq(ClassTaskAndQuesReply::getUserId,params.get("userId").toString()));
         return classTaskAndQuesReply;
@@ -1188,6 +1192,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());
+            questionWrapper.eq(ClassTaskAndQuesReply::getType,1);
             questionWrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
             questionWrapper.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId());
             List<ClassTaskAndQuesReply> questionReplys = classTaskAndQuesReplyDao.selectList(questionWrapper);
@@ -1207,6 +1212,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::getType,0);
             task0wrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
             List<ClassTaskAndQuesReply> task0Replys = classTaskAndQuesReplyDao.selectList(task0wrapper);
             if (task0Replys.size() > 0) {
@@ -1225,6 +1231,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::getType,1);
             task1wrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
             List<ClassTaskAndQuesReply> task1Replys = classTaskAndQuesReplyDao.selectList(task1wrapper);
             if (task1Replys.size() > 0) {