diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 56386009..b4bd5af8 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -968,7 +968,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
     private R resetAll(ApprovalDto approvalDto) {
         FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
-        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecord.getRecordId());
+        Long flowRecordId = approvalDto.getResultRecordId();
+        if(flowRecord != null ){
+            flowRecordId  = flowRecord.getRecordId();
+        }
+        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
         List<Long> flowRecordIds =new ArrayList<>();
         boolean flag = false ;
         for(FlowRecord f: flowRecords){
@@ -978,9 +982,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 flag = true;
             }
         }
-        flowRecordService.deleteFlowRecordByRecordId(flowRecord.getRecordId());
-        initFlowRecord(flowRecord.getRecordId());
-        List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecord.getRecordId());
+        flowRecordService.deleteFlowRecordByRecordId(flowRecordId);
+        initFlowRecord(flowRecordId);
+        List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
         for(int i = 0 ;i < newflowRecords.size() ; i ++){
             flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i));
             if(flag ){  //如果录入己经走了，设置新的数据，结果录入己走
@@ -991,7 +995,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 }
             }
         }
-        resultRecordService.resetData(flowRecord.getRecordId(),approvalDto.getClearFlag());
+        resultRecordService.resetData(flowRecordId,approvalDto.getClearFlag());
         return R.ok();
     }