From 0a80b2b83c00e885584658efc0e7774a8ac9cdc9 Mon Sep 17 00:00:00 2001
From: "yang.yongquan" <3395816735@qq.com>
Date: Wed, 13 Jul 2022 10:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=83=85=E5=86=B5=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/TaskMapper.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 4920d12..9f2ebe6 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -43,14 +43,19 @@
     </select>
     <select id="selectProjectProcessOfEveryone"
             resultType="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.TaskNumOfEveryoneDTO">
-        SELECT staff_fullname, completed_num
+        SELECT staff_fullname, IF(completed_num IS NULL, 0, completed_num) AS completed_num
         FROM (SELECT task_holder_id, SUM(IF(task_closed_time IS NULL, 0, 1)) AS completed_num
               FROM task
               WHERE !is_deleted
                 AND task_project_id = #{projectId}
                 AND task_id != 0
-              GROUP BY task_holder_id) AS T
-                 JOIN staff ON staff_id = T.task_holder_id;
+              GROUP BY task_holder_id) AS T1
+                 RIGHT JOIN (SELECT staff.staff_id, staff_fullname
+                             FROM project_group
+                                      JOIN staff ON staff.staff_id = project_group.staff_id
+                             WHERE project_id = #{projectId}) AS T2
+                            ON T1.task_holder_id = T2.staff_id
+
     </select>
     <select id="selectTaskClosedNum" resultType="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.TaskTrendDTO">
         SELECT closed_date AS task_date,