Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!342

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

@@ -372,19 +372,19 @@ public class RouterUtils {
 		if (listRouter != null && listRouter.size() == 1) {
 			router = listRouter.get(0);
 			
-			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);
-					}
-				}	
+			if(router.getRelation() != null) {
+				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) {
 			for (Router router2 : listRouter) {
 				if (router2.getFlow()) {