，，

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

@@ -669,6 +669,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         //根据唯一的流程标识 获取该流程下的所有数据
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         ew.eq("process_id", processId);
+        ew.isNotNull("to_people");
+        ew.isNotNull("from_people");
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
         //map.put("data", list);
         
@@ -1588,7 +1590,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                			if(j-1<=list.size()-1){
                				// 业务
                				ProcessAudit audit = list.get(j-1);
-               				if(null != audit.getToPeople()){
                					item.setAuditTime(audit.getAuditTime());
                    				item.setContent(audit.getToPeople());
                    				if(flag){//不通过
@@ -1600,21 +1601,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                            		}else{
                            			item.setAuditState(audit.getAuditState());
                            		}
-               				}else{
-               					ProcessAudit audit1 = list.get(j);
-               					item.setAuditTime(audit1.getAuditTime());
-                   				item.setContent(audit1.getToPeople());
-                   				if(flag){//不通过
-                           			if(j-1==list.size()-1){
-                           				item.setAuditState(2);
-                           			}else{
-                           				item.setAuditState(1);
-                           			}
-                           		}else{
-                           			item.setAuditState(audit1.getAuditState());
-                           		}
-                   				j++;
-               				}
                			}
        			}
                	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){