From 6d9aac7b612105331ae11b69b1c23a5b7ceff1f1 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 18 Nov 2020 14:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8E=B7=E5=8F=96=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java | 2 ++
 .../modules/flow/service/FlowChartDetailRecordService.java   | 3 +++
 .../flow/service/impl/FlowChartDetailRecordServiceImpl.java  | 5 +++++
 .../lz/modules/flow/service/impl/FlowStartServiceImpl.java   | 4 ++--
 .../resources/mapper/flow/FlowChartDetailRecordMapper.xml    | 4 ++++
 src/main/resources/mapper/flow/FlowChartMapper.xml           | 2 +-
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java
index c73ccc97..646c5c30 100644
--- a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java
@@ -43,4 +43,6 @@ public interface FlowChartDetailRecordMapper extends BaseMapper<FlowChartDetailR
 	int updateCoverFlowChartDetailRecordByIds(@Param("list") List<FlowChartDetailRecord> updaes);
 
     List<FlowChartDetailRecord> selectFlowChartDetailRecordsByFlowProcess(@Param("groupId") Long groupId, @Param("flowProcess") int flowProcess);
+
+    List<FlowChartDetailRecord> selectOpenFlowChartDetailRecordByGroupIdAndChartId(@Param("groupId") Long groupId, @Param("chartId") Long chartId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java
index 7662a366..685c89d3 100644
--- a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java
+++ b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java
@@ -42,4 +42,7 @@ public interface FlowChartDetailRecordService extends IService<FlowChartDetailRe
 	int updateCoverFlowChartDetailRecordByIds(List<FlowChartDetailRecord> updaes);
 
     List<FlowChartDetailRecord> selectFlowChartDetailRecordsByFlowProcess(Long groupId, int flowProcess);
+
+    //获取开启节点的
+	List<FlowChartDetailRecord> selectOpenFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java
index b132375d..54f230ee 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java
@@ -86,6 +86,11 @@ public class FlowChartDetailRecordServiceImpl extends ServiceImpl<FlowChartDetai
 		return flowChartDetailRecordMapper.selectFlowChartDetailRecordsByFlowProcess(groupId, flowProcess);
 	}
 
+	@Override
+	public List<FlowChartDetailRecord> selectOpenFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId){
+		return flowChartDetailRecordMapper.selectOpenFlowChartDetailRecordByGroupIdAndChartId(groupId, chartId);
+	}
+
 
 
 
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 d925e7a3..deaff8e8 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
@@ -355,7 +355,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 		for (FlowChart chart:flowCharts
 		) {//按照节点顺序获取正确的流程
 			List<FlowChartDetailRecord> flowChartDetailRecords1
-					= flowChartDetailRecordService.selectFlowChartDetailRecordByGroupIdAndChartId(evaluationGroup.getId(), chart.getId());
+					= flowChartDetailRecordService.selectOpenFlowChartDetailRecordByGroupIdAndChartId(evaluationGroup.getId(), chart.getId());
 			flowChartDetailRecords.addAll(flowChartDetailRecords1);
 		}
 
@@ -695,7 +695,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 								staffManages.put(key, departManagers.getManagers());
 							}
 
-							if(staffLeader.size() == 0){
+							if(staffLeader == null || staffLeader.size() == 0){
 								//没有领导，通知到组设置的绩效管理人员
 								for (StaffEntity entity:staffManagers
 								) {
diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
index 842702da..8fe9b8d4 100644
--- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
@@ -175,5 +175,9 @@
         and chart_id = (select id from lz_flow_chart where flow_process = #{flowProcess}) and is_delete = 0 order by step_index asc
     </select>
 
+    <select id="selectOpenFlowChartDetailRecordByGroupIdAndChartId" resultType="FlowChartDetailRecord" >
+        select * from lz_flow_chart_detail_record  where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 and status = 1 order by step_index asc
+    </select>
+
 </mapper>
 
diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml
index 948bfa61..9209f5c3 100644
--- a/src/main/resources/mapper/flow/FlowChartMapper.xml
+++ b/src/main/resources/mapper/flow/FlowChartMapper.xml
@@ -122,7 +122,7 @@
     <select id="selectCanSetChartRoleByChartId" resultType="com.lz.modules.flow.model.FlowChartRoleDto" >
         SELECT crole.id as id, crole.chart_id as chart_id, crole.role_id as role_id, role.name as role_name,
         crole.type as type FROM lz_flow_chart_role crole left join lz_record_role role on role.id=crole.role_id
-        where crole.chart_id=#{id} and crole.type = 0
+        where crole.chart_id=#{id} and crole.type = 0 and crole.is_delete=0
     </select>
 
 </mapper>