Skip to content

8
8timerapiv200
Commit 508e6fc4 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!342
parents 2d963d5b 883c9239
Showing with 11 additions and 11 deletions
src/main/java/cn/timer/api/utils/router/RouterUtils.java
...@@ -372,19 +372,19 @@ public class RouterUtils { ...@@ -372,19 +372,19 @@ public class RouterUtils {
if (listRouter != null && listRouter.size() == 1) { if (listRouter != null && listRouter.size() == 1) {
router = listRouter.get(0); router = listRouter.get(0);
for (Relation relation : router.getRelation()) { if(router.getRelation() != null) {
if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) { for (Relation relation : router.getRelation()) {
if (router.getFlow()) { if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
FlowChildren fc = FlowChildren.builder().build(); if (router.getFlow()) {
BeanUtil.copyProperties(router, fc, "condition","children"); FlowChildren fc = FlowChildren.builder().build();
listFlowChildren.add(fc); BeanUtil.copyProperties(router, fc, "condition","children");
getIsFlowChildren(router.getChildren(), listFlowChildren); listFlowChildren.add(fc);
} getIsFlowChildren(router.getChildren(), listFlowChildren);
} }
}
}
} }
// Relation relation = CollectionUtil.getFirst(router.getRelation()); // 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) {
if (router2.getFlow()) { if (router2.getFlow()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment