添加节点类型、标签等

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">

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}