。。

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

@@ -137,11 +137,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 	                processAudit.setProcessId(UUID.randomUUID().toString());//唯一的流程标识
                 }else{ //其他步骤带审批的
             		//修改第一条数据
-            		/*QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
+            		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
             		ew.eq("process_id", processId).eq("result", 1);
             		ProcessAudit processAudit1 = new ProcessAudit();
             		processAudit1.setResult(0);
-            		processAuditMapper.update(processAudit1, ew);*/
+            		processAuditMapper.update(processAudit1, ew);
             		//新增
             		processAudit.setResult(1);//第一条数据 保存并审批  1是0否
             		processAudit.setProcessId(processId);
@@ -656,22 +656,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
                  
                  //如果是多流程 则把审批数据分开
-                 QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
-                 ew1.eq("process_id", processId);
-                 ew1.eq("result", 1);
-                 List<ProcessAudit> list1 = processAuditMapper.selectList(ew1);
-                 if(list1.size()>1){ //多流程
-                	 QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
-                     ew2.eq("process_id", processId);
-                     ew2.eq("result", 1);
-                     ew2.eq("type", list1.get(1).getType());
-                     list2 = processAuditMapper.selectList(ew2);
-                	/*int index = 0;
-                	boolean flag = true;
+                 if(list.get(0).getResult() == 0){ //如果是多流程 则把审批数据分开
+                	int index = 0;
                  	for (int i = 0; i < list.size(); i++) {
                      	if(list.get(i).getResult() == 1){
                      		index = i;
-                     		flag = false;
                      		break;
                      	}
              		}
@@ -679,7 +668,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
  						if( i >= index){
  							list2.add(list.get(i));
  						}
- 					}*/
+ 					}
 	                 if(list2.size()>0){
 	                	 depot = list2.get(0).getDepotId();
 	                     ongoingStep = Integer.valueOf(list2.get(0).getOngoingStep());
@@ -831,10 +820,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
         if (StringUtils.isNotBlank(object.optString("userId"))) {
             ew.eq("apply_people", object.optString("userId"));
+            ew.eq("from_people", object.optString("userId"));
         }
-        ew.eq("result", 1);//整个流程的第一条数据
+        //ew.eq("result", 1);//整个流程的第一条数据
         //只获取审批的数据
-        ew.isNotNull("from_people");
         ew.isNotNull("to_people");
         ew.orderByDesc("id");