From d504f3acc18e18d26b07ea3e68ef20c1e3d7022e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 2 Mar 2022 12:32:05 +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

---
 .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 2 +-
 .../src/main/java/com/xm/core/service/XmTaskService.java | 5 +++--
 .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml          | 9 ++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index c79d407b..51451496 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -1090,7 +1090,7 @@ public class XmTaskController {
 				BatchRelTasksWithMenu tasksWithMenu=new BatchRelTasksWithMenu();
 				tasksWithMenu.setMenuId(xmMenuDb.getMenuId());
 				tasksWithMenu.setTaskIds(allowTasks.stream().map(i->i.getId()).collect(Collectors.toList()));
-				xmTaskService.batchRelTasksWithMenu(tasksWithMenu);
+				xmTaskService.batchRelTasksWithMenu(tasksWithMenu,xmMenuDb);
 			}
 			msgs.add("成功将"+allowTasks.size()+"个任务与需求关联。");
 			for (XmTask t : allowTasks) {
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index ef2194dc..6d909edc 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -391,10 +391,11 @@ public class XmTaskService extends BaseService {
 	
 	/**
 	 * 批量更新任务的需求为新的需求或者更新为空
-	 * @param xmTasks
+	 * @param tasksWithMenu
 	 */
 	@Transactional
-	public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu) {
+	public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu,XmMenu xmMenuDb) {
+		Map<String,Object> map=map("menuId",tasksWithMenu.getMenuId(),"menuName",xmMenuDb.getMenuName(),"productId",xmMenuDb.getProductId(),"taskIds",tasksWithMenu.getTaskIds());
 		 super.update("batchRelTasksWithMenu",tasksWithMenu);
 	}
 
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 d3361c01..d1eeb9f7 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
@@ -103,7 +103,14 @@
 			( #{item})
 		</foreach>
 	</update>
-
+	<update id="batchRelTasksWithPhase" parameterType="HashMap">
+		update xm_task res set res.menu_id=${menuId},res.menu_name =${menuName} res.product_id=#{productId}
+		where res.id in
+		<foreach collection="taskIds" item="item" index="index" open="(" separator="," close=")" >
+			( #{item})
+		</foreach>
+		and res.ntype='0'
+	</update>
 
 	<!-- 插入流程审批表数据 -->
 	<insert id="insertProcessApprova"