优化查询条件

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>