修复前端流程获取的权限

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);
 }

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);
 }

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);
+	}
+
 
 
 

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
 								) {

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>
 

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>