草稿箱发布审批流程bug

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -1249,7 +1249,7 @@ public class SpmkController {
 				.set("initiator", ygglMainEmp.getName())
 				.set("initiator", ygglMainEmp.getName())
 				.set("headUrl", ygglMainEmp.getHeadUrl())
 				.set("headUrl", ygglMainEmp.getHeadUrl())
 				.set("id", userBean.getEmpNum());
 				.set("id", userBean.getEmpNum());
-		RouterUtils.NextNode(listRouter, jSONObject, ISFIRST);
+		RouterUtils.NextNode(listRouter, jSONObject, ISFIRST,true);
 		List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
 		List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
 		RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
 		RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
 
 

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -91,7 +91,7 @@ public class RouterUtils {
 	}
 	}
 
 
 	// 执行下一个节点
 	// 执行下一个节点
-	public static List<Router> NextNode(List<Router> listRouter,JSONObject obj, boolean isFirse, boolean isAuditNext) throws NumberFormatException, ConvertException, Exception {
+	public static List<Router> NextNode(List<Router> listRouter,JSONObject obj, boolean isFirse, boolean isAuditNext,boolean... isDrafts) throws NumberFormatException, ConvertException, Exception {
 
 
 		Router router;
 		Router router;
 		if (CollectionUtil.isNotEmpty(listRouter)) {
 		if (CollectionUtil.isNotEmpty(listRouter)) {
@@ -160,9 +160,10 @@ public class RouterUtils {
 //						}
 //						}
 
 
 						if (!isAuditNext) {
 						if (!isAuditNext) {
-							
+							//此处如果是草稿就不需要更改
+							if(isDrafts!=null) {
 								router.setExecute(EXECUTING);
 								router.setExecute(EXECUTING);
-							
+							}
 							if(router.getRelation().size() > 0) {
 							if(router.getRelation().size() > 0) {
 	//							if (r != null && RELATION_TYPE_USERS.equals(r.getType())) {
 	//							if (r != null && RELATION_TYPE_USERS.equals(r.getType())) {
 										List<User> listUser = router.getRelation().get(0).getUsers();
 										List<User> listUser = router.getRelation().get(0).getUsers();
@@ -175,7 +176,9 @@ public class RouterUtils {
 													}
 													}
 													switch (execute) {
 													switch (execute) {
 													case UNEXECUTED:
 													case UNEXECUTED:
+														if(isDrafts!=null) {
 															listUser.get(i).setExecute(EXECUTING);
 															listUser.get(i).setExecute(EXECUTING);
+														}
 														// 首次发起申请时，写入 审批人名称 至 obj 中
 														// 首次发起申请时，写入 审批人名称 至 obj 中
 														if (isFirse && obj.getStr("current_approver") == null ) {
 														if (isFirse && obj.getStr("current_approver") == null ) {
 															obj.set("current_approver", listUser.get(i).getName());
 															obj.set("current_approver", listUser.get(i).getName());