diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index f533b35c..ec248c3c 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -206,7 +206,7 @@ public class ResultRecordController extends AbstractController {
                 .put("wenHuaJiaZhiGuanNum", wenHuaJiaZhiGuanNum)
                 .put("lastResultNum", lastResultNum)
                 .put("commentNum", commentNum)
-                .put("superStaff",superStaff);
+                .put("superStaff", superStaff);
     }
 
     @RequestMapping("/commitApproval")
@@ -218,6 +218,19 @@ public class ResultRecordController extends AbstractController {
             ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId());
             resultRecord.setStatus(Constant.STATUS_3);
             resultRecordService.updateResultRecordById(resultRecord);
+        } else if (req.getStatus() == 4) { // 驳回
+            List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(req.getRecordResultId());
+            ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId());
+            if (flowRecords.size() > 0 && req.getRollbackFlowId() > 0) {
+                for (FlowRecord flowRecord : flowRecords) {
+                    if (flowRecord.getId().equals(req.getRollbackFlowId())) {
+                        resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole());
+                    } else {
+                        resultRecord.setStatus(1);
+                    }
+                    resultRecordService.updateResultRecordById(resultRecord);
+                }
+            }
         }
         return R.ok("成功");
     }
diff --git a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java
index bd038715..5954fa5c 100644
--- a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java
+++ b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java
@@ -34,4 +34,5 @@ public class ResultRecordReq {
     private String departmentLevel ;
     private String resultComment;
     private Long resultCommitId;
+    private Long rollbackFlowId;
 }
diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
index 00c013bd..898cc3bb 100644
--- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
@@ -38,4 +38,6 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
     FlowRecord selectNotApprovalStaffIdFlowRecords(@Param("recordId") Long recordId);
 
 	List<FlowRecord> selectFlowRecordByRecordId(@Param("recordId") Long recordId);
+
+	List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId, @Param("rollbackFlowId") Long rollbackFlowId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
index 5166868f..988598e3 100644
--- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
+++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
@@ -40,4 +40,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
     List<FlowRecord> selectFlowRecordByRecordId(Long recordId);
 
 	void initFlowRecord(ResultRecord resultRecord , Long roleId , Integer type , String name);
+
+	List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
index a17a3fea..b28eec96 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
@@ -15,6 +15,7 @@ import org.apache.tomcat.util.bcel.Const;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.awt.*;
 import java.util.List;
 
 /**
@@ -105,5 +106,10 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
 		flowRecord.setDepartmentLevel(Constant.ME);
 	}
 
+	@Override
+	public List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId) {
+		return flowRecordMapper.selectFlowRecordByResultRecordIdFlowId(recordResultId, rollbackFlowId);
+	}
+
 
 }
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index 6fa869d7..5d92a089 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -127,6 +127,9 @@
     <select id="selectFlowRecordByRecordId" resultType="com.lz.modules.flow.entity.FlowRecord">
         select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordId}
     </select>
+    <select id="selectFlowRecordByResultRecordIdFlowId" resultType="com.lz.modules.flow.entity.FlowRecord">
+         select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordId} and id > #{rollbackFlowId}
+    </select>
 
 
 </mapper>