diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
index 2fc31be5..88d7e406 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
@@ -67,7 +67,7 @@ public class FlowChartController {
for (FlowChartDetailRecord record:flowChartDetailRecords
) {
- flowChartDetailRecordListDto.setStatus(dto.getStatus());
+ flowChartDetailRecordListDto.setStatus(record.getStatus());
FlowChartDetailRecordSimpleDto detailRecordSimpleDto = new FlowChartDetailRecordSimpleDto();
BeanUtils.copyProperties(record, detailRecordSimpleDto);
@@ -150,12 +150,14 @@ public class FlowChartController {
flowChartDetailRecord.setChartId(flowChartDetailRecordListReq.getId());
flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId());
flowChartDetailRecord.setStepIndex(index);
+ flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus());
if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){
updaes.add(flowChartDetailRecord);
}else{
inserts.add(flowChartDetailRecord);
}
if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){
+ //本节点没有删除,那么顺序++
index++;
}
diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
index d3031e1f..002b9886 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
@@ -269,8 +269,8 @@ public class FlowStartController {
flowApprovalRoles.add(flowApprovalRole);
flowApprovalRole.setStepIndex(stepIndex);
}
- stepIndex++;
}
+ stepIndex++;
}else{
String[] roleIds = flowChartDetailRecord.getRoleIds().split(",");
for (String roleId:roleIds
diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
index 499d9267..0206b2a5 100644
--- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
@@ -110,7 +110,7 @@