ydlife 我的团队中数据查询（S1不是直属S3，则不显示在S3下

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -839,8 +839,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                         getTeamMemberDetails(s1DataList,teamMemberList,"1");
                         getTeamMemberDetails(s1DataList,teamMemberList,"1");
                         groupList.addAll(s2DataList);
                         groupList.addAll(s2DataList);
                     } else if ("S3".equals(teamList.get(0).getPractitionerLevel())) {
                     } else if ("S3".equals(teamList.get(0).getPractitionerLevel())) {
-                        commFor(s1DataList, teamMemberList);
-                        getTeamMemberDetails(s1DataList,teamMemberList,"1");
+                        // 如果S1不是直属S3，则不在S3下显示
+                        for (TeamMemberDetail teamMemberDetail : s1DataList) {
+                            if(StringUtils.isNotBlank(teamMemberDetail.getS2system())){
+                                continue;
+                            }
+                            List<TeamMemberDetail> arrayList = new ArrayList<>();
+                            arrayList.add(teamMemberDetail);
+                            commFor(arrayList, teamMemberList);
+                            getTeamMemberDetails(arrayList,teamMemberList,"1");
+                        }
 
 
                         commFor(s2DataList, teamMemberList);
                         commFor(s2DataList, teamMemberList);
                         getTeamMemberDetails(s2DataList,teamMemberList,"2");
                         getTeamMemberDetails(s2DataList,teamMemberList,"2");