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 2 additions and 2 deletions
src/main/java/cn/timer/api/utils/router/RouterUtils.java
...@@ -372,6 +372,7 @@ public class RouterUtils { ...@@ -372,6 +372,7 @@ public class RouterUtils {
if (listRouter != null && listRouter.size() == 1) { if (listRouter != null && listRouter.size() == 1) {
router = listRouter.get(0); router = listRouter.get(0);
if(router.getRelation() != null) {
for (Relation relation : router.getRelation()) { for (Relation relation : router.getRelation()) {
if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) { if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
if (router.getFlow()) { if (router.getFlow()) {
...@@ -382,9 +383,8 @@ public class RouterUtils { ...@@ -382,9 +383,8 @@ public class RouterUtils {
} }
} }
} }
}
// 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