ydlife 我的团队中数据查询(代码优化

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

@@ -816,11 +816,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             if(StringUtils.isNotBlank(systemType)){
                 if("S2".equals(systemType)){
                     if(null != s1DataList){
-                        for (TeamMemberDetail teamMemberDetail : s1DataList) {
-                            if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
-                                teamMemberList.add(teamMemberDetail);
-                            }
-                        }
+                        commFor(s1DataList, teamMemberList);
                     }
                     //没有团队长
                     getTeamMemberDetails(s1DataList,teamMemberList,"1");
@@ -837,26 +833,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 //根据职级进行数据筛选
                 if (null != teamList && teamList.size() > 0) {
                     if ("S2".equals(teamList.get(0).getPractitionerLevel())) {
-                        for (TeamMemberDetail teamMemberDetail : s1DataList) {
-                            if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
-                                teamMemberList.add(teamMemberDetail);
-                            }
-                        }
+                        //1获取当前经纪人所在的团队信息
+                        commFor(s1DataList, teamMemberList);
+                        //2当前团队没有团长，根据体系id去重，只显示一个组织
                         getTeamMemberDetails(s1DataList,teamMemberList,"1");
                         groupList.addAll(s2DataList);
                     } else if ("S3".equals(teamList.get(0).getPractitionerLevel())) {
-                        for (TeamMemberDetail teamMemberDetail : s1DataList) {
-                            if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
-                                teamMemberList.add(teamMemberDetail);
-                            }
-                        }
+                        commFor(s1DataList, teamMemberList);
                         getTeamMemberDetails(s1DataList,teamMemberList,"1");
-                        for (TeamMemberDetail teamMemberDetail : s2DataList) {
-                            if (null != teamMemberDetail.getOwnerPractitionerId() &&  teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
-                                teamMemberList.add(teamMemberDetail);
-                            }
-                        }
 
+                        commFor(s2DataList, teamMemberList);
                         getTeamMemberDetails(s2DataList,teamMemberList,"2");
                         groupList.addAll(s3DataList);
 
@@ -897,6 +883,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return resp;
     }
 
+    //获取当前经纪人所在的团队信息
+    private void commFor(List<TeamMemberDetail> s1DataList, List<TeamMemberDetail> teamMemberList) {
+        for (TeamMemberDetail teamMemberDetail : s1DataList) {
+            if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
+                teamMemberList.add(teamMemberDetail);
+            }
+        }
+    }
+
     //没有团队长的组织 根据体系id去重，只显示一个组织
     private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) {
         if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){