From 22a00e4677f89845bc3cbea0ea4740c21f7d70a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 16 Feb 2022 01:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=97=B4=E7=9A=84=E5=8D=95=E7=8B=AC=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/dao/XmIterationMenuMapper.xml     |  3 +-
 .../mapper/xm/core/dao/XmMenuMapper.xml       | 59 +------------------
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml
index cdc1f1bf..f69301d9 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml
@@ -14,7 +14,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select res.*,m.menu_name,m.seq_no,m.pmenu_id,m.mm_userid,m.mm_username from xm_iteration_menu res left join xm_menu m on m.menu_id=res.menu_id
+		select res.*,m.menu_name,m.seq_no,m.pmenu_id,m.mm_userid,m.mm_username,m.children_cnt,m.ntype from xm_iteration_menu res left join xm_menu m on m.menu_id=res.menu_id
 		<where> 
 			<if test="ids != null">  and     
 				id in
@@ -25,6 +25,7 @@
 			<include refid="where"/>
 			<if test="key != null and key !='' "> and m.menu_name like #{key}     </if>
 		</where>
+		order by m.seq_no asc
 	</select>
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
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 fb2e3b63..4299cdff 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
@@ -20,6 +20,7 @@
 			exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
 		</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</if>
     </sql>
 
 	<select id="selectExistIterationMenus" parameterType="HashMap" resultType="com.xm.core.entity.XmMenu">
@@ -37,70 +38,16 @@
 	<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
 		select res.*,s.* from xm_menu res left join xm_menu_state s on res.menu_id=s.menu_id
 		<where>
-			<if test="ids != null">  and
-				menu_id in
-				<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-					#{item}
-				</foreach>
-			</if>
+			<include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test=' iterationFilterType=="join" '>
-				and exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id
-				<if test="iterationId!=null"> and im.iteration_id=#{iterationId}</if>
-				)
-			</if>
-			<if test='iterationFilterType=="not-join"'>
-				and   not    exists ( select 1 from 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>
-				exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
-			</if>
-
-			<if test=' projectId !=null and projectId!="" and ( taskFilterType==null or taskFilterType=="" )'>
-				and  exists ( select 1 from xm_task t where t.menu_id =res.menu_id and t.project_id=#{projectId})
-			</if>
-			<if test="compete !=null and compete!=''">
-				and (   exists ( select 1 from xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id)
-				or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id)
-				)
-			</if>
-			<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
 		</where>
 		order by res.seq_no asc
 	</select>
 	<select id="selectListMapByWhereWithPlan" parameterType="HashMap" resultType="HashMap">
 		select res.*,plan.* from xm_menu res left join xm_menu_plan plan on res.menu_id=plan.menu_id and plan.project_id=#{projectId}
 		<where>
-			<if test="ids != null">  and
-				menu_id in
-				<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-					#{item}
-				</foreach>
-			</if>
+			<include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test=' iterationFilterType=="join" '>
-				and exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id
-				<if test="iterationId!=null"> and im.iteration_id=#{iterationId}</if>
-				)
-			</if>
-			<if test='iterationFilterType=="not-join"'>
-				and   not    exists ( select 1 from 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>
-				exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
-			</if>
-
-			<if test=' projectId !=null and projectId!="" and ( taskFilterType==null or taskFilterType=="" )'>
-				and  exists ( select 1 from xm_task t where t.menu_id =res.menu_id and t.project_id=#{projectId})
-			</if>
-			<if test="compete !=null and compete!=''">
-				and (   exists ( select 1 from xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id)
-				or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id)
-				)
-			</if>
-			<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
 		</where>
 
 		order by res.seq_no asc