ydlife 我的团队中数据查询05

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

@@ -799,13 +799,13 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                             if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
                                 teamMemberList.add(teamMemberDetail);
                             }
-                            groupList.addAll(s2DataList);
                         }
                     }
                     //没有团队长
                     if(teamMemberList == null || teamMemberList.size() == 0){
                         teamMemberList.addAll(s1DataList);
                     }
+                    groupList.addAll(s2DataList);
                 }
                 //如果是s1 直接显示所有
                 if("S1".equals(systemType)){