From abd0aca9c7dbe5d4add17ca57fa7d75ed4b26afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 11 Mar 2022 03:24:31 +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

---
 .../resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml    | 5 ++++-
 .../resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml    | 3 +++
 2 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 228cb057..781c3596 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
@@ -32,9 +32,12 @@
 		<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 or res.pmenu_id = '')</if>
 
-		<if test="projectId!=null and projectId!=''">  and
+		<if test=" projectId!=null and projectId!=''">  and
 		exists (select 1 from xm_task t where t.project_id=#{projectId} and res.menu_id=t.menu_id and t.ntype='0')
 		</if>
+		<if test=" linkProjectId!=null and linkProjectId!=''">  and
+			exists (select 1 from xm_product_project_link link where link.product_id=res.product_id and link.project_id=#{linkProjectId})
+		</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/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 059fe951..6df7f25c 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
@@ -58,6 +58,9 @@
 		<if test="isTop!=null and isTop!=''">
 			and (res.parent_taskid is null or res.parent_taskid='')
 		</if>
+		<if test="linkProductId!=null and linkProductId!=''">
+			and exists( select 1 from xm_product_project_link link where and link.product_id=#{linkProductId} and link.project_id=res.project_id)
+		</if>
     </sql>
 	<select id="getAvgRate" parameterType="String" resultType="long" >
 		select avg(res.rate) from xm_task res where res.parent_taskid = #{parentTaskid}