添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -6,6 +6,7 @@ import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.core.utils.ResponseHelper;
+import com.mdp.meta.client.service.ItemService;
 import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
@@ -56,6 +57,9 @@ public class XmTaskExecuserController {
 	@Autowired
     XmProjectGroupUserService xmProjectGroupUserService;
 
+	@Autowired
+	ItemService itemService;
+	
 
 	@Autowired
     XmProjectGroupService groupService;

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

@@ -16,12 +16,6 @@
 				#{item} like concat(res.pid_paths,'%')
 			</foreach>
 		</if>
-		<if test='iterationId!=null and iterationId!="" '>
-			and exists( select 1 from xm_task t inner join xm_menu im on t.menu_id=im.menu_id where t.project_phase_id=res.id and im.iteration_id=#{iterationId})
-		</if>
-		<if test='productId!=null and productId!="" '>
-			and exists( select 1 from xm_task t where t.product_id=#{productId} and t.project_phase_id=res.id)
-		</if>
 		<if test=" taskFilterType !=null and taskFilterType!=''">
 			and  <if test="taskFilterType=='not-join'"> not </if>
 			exists( select 1 from xm_task t where  t.project_phase_id=res.id)