From ba0aabdac3f50543b37b4022b0010dbdc53e0009 Mon Sep 17 00:00:00 2001
From: wangys <3401275564@qq.com>
Date: Fri, 28 Nov 2025 18:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=87=BA?=
 =?UTF-8?q?=E6=9C=AA=E5=8F=91=E5=B8=83=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SCLearningTaskServiceImpl.java       |  2 +-
 .../main/resources/mapper/TaskUserMapper.xml  | 38 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java
index 8619130..d0f7ffb 100644
--- a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java
+++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java
@@ -435,7 +435,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
         // 找出要删除的用户关联
         List<String> userIDsToDelete = existingUserMap.values().stream()
                 .filter(taskUser -> !newUserIDs.contains(taskUser.getUserID()))
-                .map(TbTaskUser::getID)
+                .map(TbTaskUser::getId)
                 .collect(Collectors.toList());
         
         if (!userIDsToDelete.isEmpty()) {
diff --git a/schoolNewsServ/study/src/main/resources/mapper/TaskUserMapper.xml b/schoolNewsServ/study/src/main/resources/mapper/TaskUserMapper.xml
index 02796ca..5650917 100644
--- a/schoolNewsServ/study/src/main/resources/mapper/TaskUserMapper.xml
+++ b/schoolNewsServ/study/src/main/resources/mapper/TaskUserMapper.xml
@@ -64,9 +64,22 @@
     <!-- selectTaskUsers -->
     <select id="selectTaskUsers" resultMap="BaseResultMap">
         SELECT 
-        <include refid="Base_Column_List"/>
-        FROM tb_task_user
-        <include refid="Where_Clause"/>
+          ttu.*
+        FROM tb_task_user ttu
+        INNER JOIN tb_learning_task tlt ON ttu.task_id = tlt.task_id AND tlt.status = 1
+        WHERE 1=1
+            <if test="taskID != null and taskID != ''">
+                AND ttu.task_id = #{taskID}
+            </if>
+            <if test="userID != null and userID != ''">
+                AND ttu.user_id = #{userID}
+            </if>
+            <if test="deptID != null and deptID != ''">
+                AND ttu.dept_id = #{deptID}
+            </if>
+            <if test="status != null">
+                AND ttu.status = #{status}
+            </if>
         ORDER BY create_time DESC
     </select>
 
@@ -249,9 +262,22 @@
     <!-- 分页查询任务用户关联 -->
     <select id="selectTaskUsersPage" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List" />
-        FROM tb_task_user
-        <include refid="Where_Clause" />
+            ttu.*
+        FROM tb_task_user ttu
+        INNER JOIN tb_learning_task tlt on ttu.task_id = tlt.task_id AND tlt.status=1
+        WHERE 1=1
+            <if test="taskID != null and taskID != ''">
+                AND ttu.task_id = #{taskID}
+            </if>
+            <if test="userID != null and userID != ''">
+                AND ttu.user_id = #{userID}
+            </if>
+            <if test="deptID != null and deptID != ''">
+                AND ttu.dept_id = #{deptID}
+            </if>
+            <if test="status != null">
+                AND ttu.status = #{status}
+            </if>
         ORDER BY create_time DESC
         LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset}
     </select>