From da903a4d459d0b3cffaf679a0df77bfb1fb6ec41 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, 15 Jun 2021 02:16:00 +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

---
 .../resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml   | 6 ++----
 1 file changed, 2 insertions(+), 4 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 a1836020..4ef0a5bc 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
@@ -79,10 +79,8 @@
 			 </if>
 			<include refid="where"/>
 			<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
-			<if test=" excludeIterationId !=null and excludeIterationId !='' and (includeIterationAll==null or includeIterationAll=='') "> and not exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)</if>
-			<if test=" includeIterationAll !=null and includeIterationAll !=''  and (excludeIterationId !=null and excludeIterationId !='' ) "> and  exists ( select 1 from XM.xm_iteration_menu im where  im.iteration_id !=#{excludeIterationId} and  im.menu_id=res.menu_id)</if>
-			<if test=" includeIterationAll !=null and includeIterationAll !=''  and (excludeIterationId ==null or excludeIterationId =='' ) "> and  exists ( select 1 from XM.xm_iteration_menu im where  im.menu_id=res.menu_id)</if>
-
+			<if test=' excludeIterationId !=null and excludeIterationId !="" and excludeIterationAll!="1" '> and not exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)</if>
+			<if test=' excludeIterationAll =="1" '> and not exists ( select 1 from XM.xm_iteration_menu im where  im.menu_id=res.menu_id)</if>
 		</where>
 		order by res.seq_no asc
 	</select>