Merge branch 'dev-tiande-member' into dev-tiande

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -372,12 +372,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             } else { //如果上级没有会员信息，查询上级是否符合条件，符合条件可以直接新增会员信息
                 List<BaseUserMemberLevel> newLevelList = userMemberLevelList.stream().filter(p -> p.getIsShare() == 1).collect(Collectors.toList());
                 BaseUserMemberLevel parentLevel = null;
-                for (BaseUserMemberLevel baseUserMemberLevel : newLevelList) {
-                    List<BaseUserMember> baseUserMemberList = mapper.selectAllChildrenByLevel(parentId, baseUserMemberLevel.getLevel() - 1);
+                for (int i = 0; i < newLevelList.size(); i ++) {
+                    List<BaseUserMember> baseUserMemberList = mapper.selectAllChildrenByLevel(parentId, newLevelList.get(i).getLevel() - 1);
                     if (baseUserMemberList != null && baseUserMemberList.size() >= getLimitNumber()) {
                         continue;
                     } else {
-                        parentLevel = baseUserMemberLevel;
+                        if (i > 0) {
+                            parentLevel = newLevelList.get(i-1);
+                        }
                         break;
                     }
                 }