From 6ad82c32556150407e5d9d193b13f4776126f79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 20 Jul 2021 11:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xm/core/dao/XmIterationProductLinkMapper.xml  | 9 ++++++++-
 .../mybatis/mapper/xm/core/dao/XmProjectMapper.xml       | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml
index fc8d8a1c..35e9157f 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml
@@ -14,7 +14,14 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from XM.xm_iteration_product_link res
+		SELECT
+			res.*,
+			i.iteration_name,
+			pro.product_name
+		FROM
+		XM.xm_iteration_product_link res
+		INNER JOIN xm_iteration i ON res.iteration_id = i.id
+		INNER JOIN xm_product pro ON res.product_id = pro.id
 		<where> 
 			<if test="ids != null">  and     
 				iteration_id in
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index c0f6ff49..37059fb0 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -121,9 +121,9 @@
 				)
 			</if>
 			<if test="iterationId!=null and iterationId!=''">
-				and exists( select 1 from xm_iteration_product_link ipl inner join xm_product_project ppl
+				and exists( select 1 from xm_iteration_product_link ipl inner join xm_product_project_link ppl
 				on ipl.product_id=ppl.product_id
-				where ipl.product_id =res.id and ipl.iteration_id=#{iterationId}
+				where ppl.project_id =res.id and ipl.iteration_id=#{iterationId}
 				)
 			</if>
 			<if test="key != null and key !='' ">  and res.name like #{key}  </if>