From 73889446fdb9654d95757e5296a44b6d95b05c2e Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 18 Dec 2020 20:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E8=80=83=E8=AF=84?=
 =?UTF-8?q?=E7=BB=84=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89=E4=BA=BA=E6=97=B6?=
 =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=8F=91=E8=B5=B7=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowStartServiceImpl.java    | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index c69ef1ac..f96ffa37 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -217,7 +217,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			}).collect(Collectors.toList());
 			Map<String, String> maps = ids1.stream().collect(Collectors.toMap(e->e, e->e));
 
-
+			//求差集发起，但是历史记录怎么搞
 			List<String> ids= Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, String>() {
 				@Override
 				public String apply(String s) {
@@ -233,17 +233,25 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				i++;
 			}
 
-			if(ids.size() == 0){
-				return R.ok("发起成功，该任务已经发起过")
-						.put("data", flowStart1);
-			}
-			ids1.addAll(ids);
-			flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
-			updateFlowStartById(flowStart1);//更新组信息到记录里面
 
-			flowStart.setGroupIds(ids.stream().collect(Collectors.joining(",")));//过滤后的考核组
-			flowStart.setId(flowStart1.getId());
-			flowStart.setIsDelete(flowStart1.getIsDelete());
+
+
+			if(ids.size() == 0){
+				/*return R.ok("发起成功，该任务已经发起过")
+						.put("data", flowStart1);*/
+				log.info("可能会使用历史数模板数据");
+				flowStart.setId(flowStart1.getId());
+				flowStart.setIsDelete(flowStart1.getIsDelete());
+			}else{
+				log.info("有新增组");
+				ids1.addAll(ids);
+				flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
+				updateFlowStartById(flowStart1);//更新组信息到记录里面
+
+				flowStart.setGroupIds(ids.stream().collect(Collectors.joining(",")));//过滤后的考核组
+				flowStart.setId(flowStart1.getId());
+				flowStart.setIsDelete(flowStart1.getIsDelete());
+			}
 		}