From dca0de44c255e54b7daaa2a8e0aab0e9952bfda4 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, 18 Mar 2022 10:48:20 +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

---
 .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml      | 12 ++++++------
 .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml      |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

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 0f128794..089f29fb 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
@@ -22,10 +22,10 @@
 			</foreach>
 		</if>
 		<if test=' iterationFilterType!=null and iterationFilterType!=""'>
-			<if test='iterationFilterType=="not-join-any-iteration"'> and (res.iteration_id is  null or res.iteration_id ='') </if>
-			<if test='iterationFilterType=="join-any-iteration"'> and ( res.iteration_id is not null and res.iteration_id !=''  ) </if>
+			<if test='iterationFilterType=="not-join-any-iteration"'> and (res.iteration_id is  null  ) </if>
+			<if test='iterationFilterType=="join-any-iteration"'> and ( res.iteration_id is not null   ) </if>
 			<if test='iterationFilterType=="join-curr-iteration"'>  and res.iteration_id=#{filterIterationId}   </if>
-			<if test='iterationFilterType=="not-join-curr-iteration"'>  and res.iteration_id!=#{filterIterationId}   </if>
+			<if test='iterationFilterType=="not-join-curr-iteration"'>  and (res.iteration_id!=#{filterIterationId} or res.iteration_id is null)   </if>
 		</if>
 		<if test=' taskFilterType!=null and taskFilterType!="" '>
 			<if test='taskFilterType=="not-join-curr-project"'>
@@ -42,12 +42,12 @@
 			</if>
 		</if>
 		<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="isTop!=null and isTop!=''">  and (res.pmenu_id is null )</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>
 		<if test=" linkIterationId!=null and linkIterationId!=''">  and
-			exists (select 1 from xm_iteration_link link where link.pro_id=res.product_id and link.iteration_id=#{linkIterationId})
+			exists (select 1 from xm_iteration_link link where link.pro_id=res.product_id and link.iteration_id=#{linkIterationId} and link.ltype='1')
 		</if>
 	</sql>
 
@@ -188,7 +188,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select (select sum(1) from xm_menu m where m.pmenu_id=res.menu_id ) as children_cnt,res.* from xm_menu res left join xm_iteration i on res.iteration_id=i.id
+		select (select sum(1) from xm_menu m where m.pmenu_id=res.menu_id ) as children_cnt,res.*,i.iteration_name from xm_menu res left join xm_iteration i on res.iteration_id=i.id
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
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 77f078e0..f9163018 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
@@ -351,9 +351,8 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select  (select sum(1) from xm_task t where t.parent_taskid=res.id) as children_cnt, res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state
-		from xm_task res   left join  xm_task_process_approva pa on res.id=pa.xm_task_id and res.biz_proc_inst_id=pa.proc_inst_id
-		left join xm_project p on p.id=res.project_id
+		select  (select sum(1) from xm_task t where t.parent_taskid=res.id) as children_cnt, res.*
+		from xm_task res
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>