From 3e7b248e1aa04f7de435a13304d9cbb2a93fbd9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 17 Jun 2021 02:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 d0d87f2c..46acbad6 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
@@ -28,9 +28,9 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
-			<if test=' excludeIterationId !=null and excludeIterationId !="" and iterationFilterType!=null and iterationFilterType!=""'>
+			<if test=' iterationFilterType!=null and iterationFilterType!=""'>
 				and <if test='iterationFilterType=="not-join"'> not  </if>
-				exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)
+				exists ( select 1 from XM.xm_iteration_menu im where im.menu_id=res.menu_id)
 			</if>
 			<if test=' taskFilterType!=null and taskFilterType!="" '>
 				and <if test='taskFilterType=="not-join"'> not  </if>
@@ -57,9 +57,9 @@
 			 </if>
 			<include refid="where"/>
 			<if test=" projectId !=null and projectId !='' "> and plan.project_id=#{projectId}</if>
-			<if test=' excludeIterationId !=null and excludeIterationId !="" and iterationFilterType!=null and iterationFilterType!=""'>
+			<if test=' iterationFilterType!=null and iterationFilterType!=""'>
 				and <if test='iterationFilterType=="not-join"'> not  </if>
-				exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)
+				exists ( select 1 from XM.xm_iteration_menu im where im.menu_id=res.menu_id)
 			</if>
 			<if test=' taskFilterType!=null and taskFilterType!="" '>
 				and <if test='taskFilterType=="not-join"'> not  </if>
@@ -91,10 +91,9 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
-
-			<if test=' excludeIterationId !=null and excludeIterationId !="" and iterationFilterType!=null and iterationFilterType!=""'>
+			<if test=' iterationFilterType!=null and iterationFilterType!=""'>
 				and <if test='iterationFilterType=="not-join"'> not  </if>
-				  exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)
+				exists ( select 1 from XM.xm_iteration_menu im where im.menu_id=res.menu_id)
 			</if>
 			<if test=' taskFilterType!=null and taskFilterType!="" '>
 				and <if test='taskFilterType=="not-join"'> not  </if>