From eb21642e3350d0b9676011e90f1bdf0b14cbd566 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, 22 Mar 2022 05:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
index 00f47340..74889937 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
@@ -16,7 +16,7 @@
 			exists ( select 1 from xm_group_user gu where gu.group_id=res.id and  gu.username like concat('%',#{groupUsernameKey},'%'))
 		</if>
 		<if test="orCrowBranchId!=null and orCrowBranchId!=''"> and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId})</if>
-		<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration_link ipl where (ipl.pro_id = res.product_id and ipl.ltype='1') or (ipl.pro_id=res.project_id and ipl.ltype='0'))</if>
+		<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration ipl inner join xm_product_project_link ppl on ipl.product_id=ppl.product_id  where (ipl.product_id = res.product_id or ppl.project_id=res.project_id)</if>
     </sql>
 	<delete id="deleteByProjectId" parameterType="com.xm.core.entity.XmGroup">
 		delete from xm_group where project_id = #{projectId}
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
index f0ee9c4c..2671d16c 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
@@ -27,15 +27,9 @@
 			<if test="productId != null and productId !='' ">  and  im.product_id=#{productId}    </if>
 			)
 		</if>
-
-		<if test="( productId != null and productId !='') and ( menuId == null or menuId =='') and (  projectId ==null or projectId=='' ) ">
-			and exists ( select 1 from xm_iteration_link ipl
-			where  ipl.iteration_id=res.id  and ipl.pro_id=#{productId}
-			)
-		</if>
 		<if test=" projectId !=null and projectId!=''">
-			and exists( select 1 from xm_iteration_link ipl
-			where ipl.pro_id=#{projectId} and ipl.iteration_id =res.id
+			and exists( select 1 from  xm_product_project_link ppl
+			where ppl.project_id=#{projectId} and ppl.product_id =res.product_id
 			)
 		</if>
 		<if test="compete !=null and compete!=''">