合伙人登录查询下属合伙人

src/main/java/com/ydtech/modules/admin/model/vo/AppUserInfoVo.java

@@ -53,4 +53,7 @@ public class AppUserInfoVo {
     @ApiModelProperty(value = "等级背景")
     private SysPartnerConfig sysPartnerConfig;
 
+    @ApiModelProperty(value = "类型：合伙人等级")
+    private int level;
+
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -1028,6 +1028,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysPartnerConfig::getDelFlag,1).eq(SysPartnerConfig::getLevel,sysPartner.getType()));
 
             appUserInfoVo.setSysPartnerConfig(sysPartnerConfig);
+            appUserInfoVo.setLevel(sysPartner.getType());
         }
         // 获取当前日期
         LocalDate currentDate = LocalDate.now();
@@ -1064,7 +1065,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         //按等级查询
         Integer partnerType = partnerInfoDto.getPartnerType();
         if (partnerType != null) {
-            List<SysPartner> sysPartnerList1 = listMap.get(sysPartner.getType() + partnerType);
+            List<SysPartner> sysPartnerList1 = listMap.get(partnerType);
 
             if (sysPartnerList1 != null) {
                 AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
@@ -1179,10 +1180,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             return appSysPartnerVos;
 
         }
-
-        for (int i = 1; i <= listMap.size(); i++) {
+        for (Integer integer : listMap.keySet()) {
             //二级
-            List<SysPartner> sysPartnerList1 = listMap.get(sysPartner.getType() + i);
+            List<SysPartner> sysPartnerList1 = listMap.get(integer);
             if (sysPartnerList1.size() > 0) {
                 AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
                 //下级合伙人数
@@ -1227,17 +1227,59 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 }
 
                 List<String> list = new ArrayList<>();
-                if (i == 1) {
-                    //一级获取登陆人的之际工作室
-                    list.add(userId);
-                } else {
+                int type = sysPartner.getType();
+                if (type == 1) {
+                    if (integer == 2) {
+                        //一级获取登陆人的之际工作室
+                        list.add(userId);
+                    } else {
 
-                    //获取上一级合伙人，查询工作室数量
-                    List<SysPartner> sysPartners = listMap.get(sysPartner.getType() + i - 1);
-                    //上一级直接推荐的工作室数量
-                    List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-                    list.addAll(list1);
+                        //获取上一级合伙人，查询工作室数量
+                        List<SysPartner> sysPartners = listMap.get(integer - 1);
+                        //上一级直接推荐的工作室数量
+                        List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+                        list.addAll(list1);
+                    }
+                }else if (type == 2) {
+                    if (integer == 3) {
+                        //一级获取登陆人的之际工作室
+                        list.add(userId);
+                    } else {
+
+                        //获取上一级合伙人，查询工作室数量
+                        List<SysPartner> sysPartners = listMap.get(integer - 1);
+                        //上一级直接推荐的工作室数量
+                        List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+                        list.addAll(list1);
+                    }
+
+                }else if (type == 3) {
+                    if (integer == 4) {
+                        //一级获取登陆人的之际工作室
+                        list.add(userId);
+                    } else {
+
+                        //获取上一级合伙人，查询工作室数量
+                        List<SysPartner> sysPartners = listMap.get(integer - 1);
+                        //上一级直接推荐的工作室数量
+                        List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+                        list.addAll(list1);
+                    }
+
+                }else if (type == 4) {
+                    if (integer == 5) {
+                        //一级获取登陆人的之际工作室
+                        list.add(userId);
+                    } else {
+
+                        //获取上一级合伙人，查询工作室数量
+                        List<SysPartner> sysPartners = listMap.get(integer - 1);
+                        //上一级直接推荐的工作室数量
+                        List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+                        list.addAll(list1);
+                    }
                 }
+
                 List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                         .in(CollectionUtil.isNotEmpty(list), SysRelationPerson::getSuggestId, list)
                         .eq(SysRelationPerson::getDelFlag, 1)
@@ -1289,12 +1331,13 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 appSysPartnerVo.setTeamManNum(deptManNum+leaderManNum);
 
                 appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber() + appSysPartnerVo.getWorkNumber());
-                appSysPartnerVo.setPartnerType(i);
+                appSysPartnerVo.setPartnerType(integer);
                 //每一级存入map
                 appSysPartnerVos.add(appSysPartnerVo);
             }
         }
 
+
         return appSysPartnerVos;
     }