From ee7c9ebc4fe2c66e272f1352383e06e452357158 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 30 Oct 2020 11:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/flow/service/impl/FlowStartServiceImpl.java  | 6 +-----
 .../resources/mapper/flow/FlowChartDetailRecordMapper.xml   | 3 +++
 2 files changed, 4 insertions(+), 5 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 53d10c46..03176ce6 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
@@ -128,10 +128,6 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			return R.error("发起任务不存在");
 		}
 
-		/*List<StaffSimpleInfo> staffSimpleInfos = staffService.selectStaffSimpleInfos(staffIds);
-		if(staffSimpleInfos.size() == 0){
-			return R.error("无有效考核人员，考核人员已离职");
-		}*/
 		Map<String, List<StaffEntity>> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找
 		for (GroupStaffs groupStaffs:startGroupStaffIds.getGroups()
 			 ) {
@@ -154,7 +150,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			}
 		}
 
-		return R.ok();
+		return R.ok("发起成功").put("data", flowStart);
 	}
 
 	@Override
diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
index 077021e5..7c01f163 100644
--- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
@@ -110,6 +110,9 @@
     </update>
 
 
+    <select id="selectFlowChartDetailRecordByGroupIdAndChartId" resultType="FlowChartDetailRecord" >
+        select * from lz_flow_chart_detail_record  where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 order by step_index asc
+    </select>
 
     <select id="selectFlowChartDetailRecordByGroupId" resultType="FlowChartDetailRecord" >
         select * from lz_flow_chart_detail_record  where evaluation_group_id=#{groupId} and is_delete = 0 order by step_index asc