添加节点类型、标签等

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml

@@ -21,9 +21,8 @@
 			and exists( select 1 from  xm_iteration  ppl where   ppl.product_id=res.id and ppl.id=#{linkIterationId} )
 		</if>
 		<if test="compete !=null and compete!=''">
-			and ( exists ( select 1 from xm_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
-			or res.pm_userid=#{compete}
-			or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
+			and ( exists ( select 1 from xm_group_user gu inner join xm_product_project_link t on (gu.project_id=t.project_id or gu.product_id=t.product_id ) and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
+			or  res.create_userid=#{compete} or res.pm_userid=#{compete}  or res.pm_userid=#{compete} or res.adm_userid=#{compete} or res.ass_userid=#{compete}
 			)
 		</if>
 		<if test="ctimeStart!=null and ctimeEnd!=null ">and ctime between #{ctimeStart} and #{ctimeEnd}</if>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@@ -24,8 +24,7 @@
 		<!-- 我参与的  包括我创建的，我监控的，我审核的-->
 		<if test=" compete !=null and compete !='' ">
 			and (    exists ( select 1 from xm_group g,XM.xm_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
-			or  res.create_userid=#{compete}
-			or  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} )
+			or   res.pm_userid=#{compete} or res.adm_userid=#{compete} or res.ass_userid=#{compete}
 			)
 		</if>
 		<!-- 按参与角色查询等-->