From 7bace752df603f27f660c4ea938972c6866a29a3 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 Feb 2022 16:11:17 +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

---
 .../main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml | 2 +-
 .../mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml        | 3 +++
 .../main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

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 33691bba..4ee1b1ed 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
@@ -25,7 +25,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>
+		<if test="isTop != null and isTop =='1' ">  and (res.pmenu_id is null or res.pmenu_id = '')</if>
 	</sql>
 
 	<select id="selectExistIterationMenus" parameterType="HashMap" resultType="com.xm.core.entity.XmMenu">
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml
index 1c89391e..ccfed9f1 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml
@@ -18,6 +18,9 @@
 			and exists( select 1 from xm_task t where t.product_id=#{productId})
 		</if>
 		<if test="key != null and key !='' ">       </if>
+		<if test="isTop!=null and isTop=='1'">
+			and (res.parent_phase_id is null or res.parent_phase_id='')
+		</if>
     </sql>
 	<select id="selectTotalProjectAndPhaseBudgetCost" parameterType="HashMap" resultType="HashMap">
 		SELECT
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 909f23d8..25f680f1 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -52,6 +52,9 @@
 		</if>
 		<if test="key != null and key !='' ">    and res.name like #{key}   </if>
 		<if test="work != null and work != ''"> and res.rate != '100' </if>
+		<if test="isTop!=null and isTop=='1'">
+			and (res.parent_taskid is null or res.parent_taskid='')
+		</if>
     </sql>
 	<select id="getAvgRate" parameterType="String" resultType="long" >
 		select avg(res.rate) from xm_task res where res.parent_taskid = #{parentTaskid}