From 9971a509bc396d6cad08c5da034b8795d7876098 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 28 Dec 2023 09:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=8B=E6=8C=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quality/QcCheckTaskIncomeMapper.xml    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 386a4340..4548caef 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -322,12 +322,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
 		select
-			record_id recordId,
-			defect_code defectCode,
-			defect_subclass defectSubclass,
-			noOk_quality noOkQuality
-		from qc_check_task_defect
-		where del_flag = '0' and belong_to = #{belongTo}
+			qctd.record_id recordId,
+			qdt.defect_code defectCode,
+			qdt.defect_subclass defectSubclass,
+			qctd.noOk_quality noOkQuality
+		from qc_defect_type qdt
+	    left join qc_check_task_defect qctd on qdt.defect_code = qctd.defect_code
+	                                               and qctd.del_flag = '0'
+	                                               and qctd.belong_to = #{belongTo}
+		where qdt.defect_type = #{checkType}
 	</select>
 	<insert id="addCheckUsers">
 		insert into qc_check_task_user(