From c721850b3c1fe5599fa639cc6b39772fb0e3c7e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 12 Mar 2022 17:04:45 +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

---
 .../mapper/xm/core/dao/XmMenuMapper.xml       | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
index f0415789..226b82f8 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
@@ -22,22 +22,33 @@
 			</foreach>
 		</if>
 		<if test=' iterationFilterType!=null and iterationFilterType!=""'>
-			<if test='iterationFilterType=="not-join"'> and (res.iteration_id is  null or res.iteration_id ='') </if>
-			<if test='iterationFilterType=="join"'> and res.iteration_id is not null and res.iteration_id !='' </if>
+			<if test='iterationFilterType=="not-join-any-iteration"'> and (res.iteration_id is  null or res.iteration_id ='') </if>
+			<if test='iterationFilterType=="join-any-iteration"'> and ( res.iteration_id is not null and res.iteration_id !=''  ) </if>
+			<if test='iterationFilterType=="join-curr-iteration"'>  and res.iteration_id=#{filterIterationId}   </if>
+			<if test='iterationFilterType=="not-join-curr-iteration"'>  and res.iteration_id!=#{filterIterationId}   </if>
 		</if>
 		<if test=' taskFilterType!=null and taskFilterType!="" '>
-			and <if test='taskFilterType=="not-join"'> not  </if>
-			exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
+			<if test='taskFilterType=="not-join-curr-project"'>
+				and not exists(select 1 from xm_task t where  t.menu_id=res.menu_id and t.project_id=#{projectId})
+			</if>
+			<if test='taskFilterType=="not-join-any-project"'>
+				and not exists(select 1 from xm_task t where  t.menu_id=res.menu_id)
+			</if>
+			<if test='taskFilterType=="join-any-project"'>
+				and exists(select 1 from xm_task t where  t.menu_id=res.menu_id)
+			</if>
+			<if test='taskFilterType=="join-curr-project"'>
+				and exists(select 1 from xm_task t where  t.menu_id=res.menu_id and t.project_id=#{projectId})
+			</if>
 		</if>
 		<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
 		<if test="isTop!=null and isTop!=''">  and (res.pmenu_id is null or res.pmenu_id = '')</if>
-
-		<if test=" projectId!=null and projectId!=''">  and
-		exists (select 1 from xm_task t where t.project_id=#{projectId} and res.menu_id=t.menu_id and t.ntype='0')
-		</if>
 		<if test=" linkProjectId!=null and linkProjectId!=''">  and
 			exists (select 1 from xm_product_project_link link where link.product_id=res.product_id and link.project_id=#{linkProjectId})
 		</if>
+		<if test=" linkIterationId!=null and linkIterationId!=''">  and
+			exists (select 1 from xm_iteration_link link where link.pro_id=res.product_id and link.iteration_id=#{linkIterationId})
+		</if>
 	</sql>
 
 	<select id="selectExistIterationMenus" parameterType="HashMap" resultType="com.xm.core.entity.XmMenu">