From 5bc6bfaa0468505162044428516e52cd6bfe47fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 21 Apr 2022 16:50: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

---
 .../mapper/xm/core/dao/XmProductMapper.xml      | 17 ++++++++++++-----
 .../mapper/xm/core/dao/XmProjectMapper.xml      | 16 ++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index 386a36ed..0c5db8cb 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -12,11 +12,6 @@
              </foreach>
          </if>
 		<if test="key != null and key !='' ">   and res.product_name like #{key}    </if>
-		<if test=" linkProjectId !=null and linkProjectId!=''">
-			and exists( select 1 from  xm_product_project_link ppl
-			where ppl.project_id=#{linkProjectId}  and ppl.product_id=res.id
-			)
-		</if>
 		<if test=" linkIterationId !=null and linkIterationId!=''">
 			and exists( select 1 from  xm_iteration  ppl where   ppl.product_id=res.id and ppl.id=#{linkIterationId} )
 		</if>
@@ -36,10 +31,16 @@
 
 	<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
 		select res.*,s.* from xm_product res left join xm_product_state s on res.id=s.product_id
+		<if test=" linkProjectId !=null and linkProjectId!=''">
+			inner join xm_product_project_link ppl on res.id=ppl.product_id and ppl.project_id=#{linkProjectId}
+		</if>
 		<where>
 			<include refid="whereForMap"/>
 			<include refid="where"/>
 		</where>
+		<if test=" linkProjectId !=null and linkProjectId!=''">
+			order by ppl.seq asc
+		</if>
 	</select>
 
 
@@ -50,10 +51,16 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_product res
+		<if test=" linkProjectId !=null and linkProjectId!=''">
+			inner join xm_product_project_link ppl on res.id=ppl.product_id and ppl.project_id=#{linkProjectId}
+		</if>
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
 		</where>
+		<if test=" linkProjectId !=null and linkProjectId!=''">
+			order by ppl.seq asc
+		</if>
 	</select>
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index 302cb35c..e4361987 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -48,11 +48,6 @@
 		<if test="myFocus != null and myFocus != ''">
 			and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.id  )
 		</if>
-		<if test=" linkProductId !=null and linkProductId!='' ">
-			and exists( select 1 from  xm_product_project_link ppl
-			where ppl.product_id=#{linkProductId}  and ppl.project_id=res.id
-			)
-		</if>
 		<if test="linkIterationId!=null and linkIterationId!=''">
 			and exists( select 1 from xm_iteration ipl inner join xm_product_project_link l on ipl.product_id=l.product_id
 			where l.project_id =res.id and ipl.id=#{linkIterationId}
@@ -115,14 +110,19 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select res.*,s.*,
-		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_project res
+		select res.*,s.* from xm_project res
 		left join xm_project_state s on s.project_id=res.id
-		left join  xm_project_process_approva pa on res.id=pa.project_id and res.biz_proc_inst_id=pa.proc_inst_id
+ 		<if test=" linkProductId !=null and linkProductId!=''">
+			inner join xm_product_project_link ppl on res.id=ppl.project_id and ppl.product_id=#{linkProductId}
+		</if>
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
 		</where>
+
+		<if test=" linkProductId !=null and linkProductId!=''">
+			order by ppl.seq asc
+		</if>
 	</select>
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->