Commit 95455d43 authored by kongfm's avatar kongfm

Merge remote-tracking branch 'origin/developer' into developer

parents 9b7f7b21 ba307b78
...@@ -192,6 +192,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -192,6 +192,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
o.getBizOrgCode()); o.getBizOrgCode());
return menu; return menu;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
menuList.remove(null);
return buildTreeParallel(menuList); return buildTreeParallel(menuList);
} }
......
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