Merge branch 'zyq_debug' into 'develop'

解决审批问题

See merge request 8timerv2/8timerapiv200!286

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

@@ -535,14 +535,14 @@ public class SpmkController {
 			Router router = spmkApproveSummaryDto.getRouter();
 			Router router = spmkApproveSummaryDto.getRouter();
 			List<Router> routers = router.getChildren();
 			List<Router> routers = router.getChildren();
 			if (CollectionUtil.isNotEmpty(routers)) {
 			if (CollectionUtil.isNotEmpty(routers)) {
-				List<Relation> relations = routers.get(0).getRelation();
-				if (relations == null || relations.size() < 1) {
-					return ResultUtil.error("无法发起，请完善审批流程");
-				}
-				List<User> users = relations.get(0).getUsers();
-				if (CollectionUtil.isEmpty(users)) {
-					return ResultUtil.error("无法发起，请完善审批流程");
-				}
+//				List<Relation> relations = routers.get(0).getRelation();
+//				if (relations == null || relations.size() < 1) {
+//					return ResultUtil.error("无法发起，请完善审批流程");
+//				}
+//				List<User> users = relations.get(0).getUsers();
+//				if (CollectionUtil.isEmpty(users)) {
+//					return ResultUtil.error("无法发起，请完善审批流程");
+//				}
 				
 				
 			}else {
 			}else {
 				return ResultUtil.error("无法发起，请完善审批流程");
 				return ResultUtil.error("无法发起，请完善审批流程");
@@ -560,6 +560,7 @@ public class SpmkController {
 			System.out.println(listRouter);
 			System.out.println(listRouter);
 			List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
 			List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
 			RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
 			RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
+			System.out.println("listFlowChildren");
 			System.out.println(listFlowChildren);
 			System.out.println(listFlowChildren);
 			
 			
 			// 当前审批人
 			// 当前审批人

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

@@ -368,15 +368,18 @@ public class RouterUtils {
 		if (listRouter != null && listRouter.size() == 1) {
 		if (listRouter != null && listRouter.size() == 1) {
 			router = listRouter.get(0);
 			router = listRouter.get(0);
 			
 			
-			Relation relation = CollectionUtil.getFirst(router.getRelation());
-			if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
-				if (router.getFlow()) {
-					FlowChildren fc = FlowChildren.builder().build();
-					BeanUtil.copyProperties(router, fc, "condition","children");
-					listFlowChildren.add(fc);
-					getIsFlowChildren(router.getChildren(), listFlowChildren);
-				}
+			for (Relation relation : router.getRelation()) {
+				if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
+					if (router.getFlow()) {
+						FlowChildren fc = FlowChildren.builder().build();
+						BeanUtil.copyProperties(router, fc, "condition","children");
+						listFlowChildren.add(fc);
+						getIsFlowChildren(router.getChildren(), listFlowChildren);
+					}
+				}	
 			}
 			}
+//			Relation relation = CollectionUtil.getFirst(router.getRelation());
+			
 			
 			
 		}else if (listRouter != null && listRouter.size() > 1) {
 		}else if (listRouter != null && listRouter.size() > 1) {
 			for (Router router2 : listRouter) {
 			for (Router router2 : listRouter) {