Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -441,8 +441,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
             if (midGroupIds.size() == 1) {
                 midGroupId = midGroupIds.iterator().next();
             } else {
+
                 //取交集层级最大 也就是冒泡最近的
-                midGroupId = midGroupIds.stream().sorted(Comparator.comparing(mid -> storeGroupChainMap.get(mid).size()).reversed()).findFirst().get();
+                midGroupId = midGroupIds.stream().filter(s -> CollectionUtils.isNotEmpty(storeGroupChainMap.get(s))).max(Comparator.comparing(mid -> storeGroupChainMap.get(mid).size())).get();
             }
             relationMapByWxEid.get(groupMap.get(midGroupId)).add(groupId);
         });