添加节点类型、标签等

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

@@ -16,7 +16,7 @@
 			exists ( select 1 from xm_group_user gu where gu.group_id=res.id and  gu.username like concat('%',#{groupUsernameKey},'%'))
 		</if>
 		<if test="orCrowBranchId!=null and orCrowBranchId!=''"> and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId})</if>
-		<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration_link ipl where (ipl.pro_id = res.product_id and ipl.ltype='1') or (ipl.pro_id=res.project_id and ipl.ltype='0'))</if>
+		<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration ipl inner join xm_product_project_link ppl on ipl.product_id=ppl.product_id  where (ipl.product_id = res.product_id or ppl.project_id=res.project_id)</if>
     </sql>
 	<delete id="deleteByProjectId" parameterType="com.xm.core.entity.XmGroup">
 		delete from xm_group where project_id = #{projectId}

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

@@ -27,15 +27,9 @@
 			<if test="productId != null and productId !='' ">  and  im.product_id=#{productId}    </if>
 			)
 		</if>
-
-		<if test="( productId != null and productId !='') and ( menuId == null or menuId =='') and (  projectId ==null or projectId=='' ) ">
-			and exists ( select 1 from xm_iteration_link ipl
-			where  ipl.iteration_id=res.id  and ipl.pro_id=#{productId}
-			)
-		</if>
 		<if test=" projectId !=null and projectId!=''">
-			and exists( select 1 from xm_iteration_link ipl
-			where ipl.pro_id=#{projectId} and ipl.iteration_id =res.id
+			and exists( select 1 from  xm_product_project_link ppl
+			where ppl.project_id=#{projectId} and ppl.product_id =res.product_id
 			)
 		</if>
 		<if test="compete !=null and compete!=''">