，

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -278,6 +278,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		Integer auditState = jsStr.getInteger("auditState");//审批的状态（1通过，2不通过）
 		//Integer toPeople = jsStr.getInteger("toPeople"); //下一个审批人的id
 		String auditTime = jsStr.getString("auditTime");
+		String ongoingStep = jsStr.getString("ongoingStep");
 		//判断是第一个人审批还是第二个人审批
 		/*QueryWrapper<ProcessAudit> ew = new QueryWrapper<>(); 
         ew.eq("id", id);*/
@@ -327,6 +328,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 			//第二个人审批
 			processAudit.setAuditState(auditState);
 			processAudit.setAuditTime(auditTime);
+			processAudit.setOngoingStep(ongoingStep);
 	        processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
 		}
 		
@@ -439,14 +441,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 			pbList.get(1).setContent(list.get(0).getToPeople());
 		}else{
 			//已审批
-			pbList.get(1).setContent(list.get(0).getFromPeople());
-			pbList.get(2).setContent(list.get(0).getToPeople());
+			pbList.get(1).setContent(list.get(0).getToPeople());
 			pbList.get(1).setAuditTime(list.get(0).getAuditTime());
+			pbList.get(1).setAuditStuts(list.get(0).getAuditState());
 			if(list.size()>1){
+				pbList.get(2).setContent(list.get(1).getToPeople());
 				pbList.get(2).setAuditTime(list.get(1).getAuditTime());
-				pbList.get(2).setAuditStuts(list.get(0).getAuditState());
+				pbList.get(2).setAuditStuts(list.get(1).getAuditState());
 			}
-			pbList.get(1).setAuditStuts(list.get(0).getAuditState());
+			
 			
 		}
 		map.put("audit", pbList);