diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
index 315302ee..aa4a5119 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
@@ -445,7 +445,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
         LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
+        LEFT JOIN tm_task tt ON rid.task_id = tt.task_id
         WHERE IFNULL(rid.repair_num, 0) - IFNULL(rid.input_num, 0) - IFNULL(rid.reject_num, 0) > 0
+        and   tt.task_status = 0
         GROUP BY
         mt.type_id) AS subquery3 ON subquery3.type_id = mt.type_id
         LEFT JOIN (
@@ -911,7 +913,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tt.`code` AS repairCode,
         bai.create_time AS leaseTime,
         GROUP_CONCAT(DISTINCT su.nick_name ORDER BY su.nick_name SEPARATOR ', ') AS repairer,
-        bai.back_person AS creator,
+        rad.create_by AS creator,
         mm.ma_code as maCode,
         IFNULL(rad.repair_num, 0) - IFNULL(rad.repaired_num, 0) - IFNULL(rad.scrap_num, 0) AS repairNum
        /* CASE WHEN tt.task_status = 0 and rad.is_ds = 1 THEN IFNULL(rad.repair_num, 0) ELSE 0 END AS dsNum,
@@ -1019,6 +1021,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) repairer ON repairer.type_id = rid.type_id
         WHERE
         IFNULL(rid.repair_num, 0) - IFNULL(rid.input_num, 0) - IFNULL(rid.reject_num, 0) > 0
+        AND tt.task_status = 0
         <if test="typeId != null">
             AND rid.type_id = #{typeId}
         </if>