解决育成多个人时,团队业绩报错问题

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

@@ -2541,11 +2541,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             return responseVO;
         }
         List<Long> practitionerIdList = this.getPractitionerIdList(practitionerId, 1);
-        AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
-        if (null != practitioner && null != practitioner.getRaiseId()) {
-            practitionerIdList.add(practitioner.getId());
-            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitioner.getId(), null);
-            practitionerIdList.addAll(practitionerRaiseIdList);
+        List<AclPractitioner> practitionerRaises = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+        if(practitionerRaises != null && practitionerRaises.size() > 0){
+        	for(AclPractitioner : practitioner practitionerRaises){
+		        if (null != practitioner && null != practitioner.getRaiseId()) {
+		            practitionerIdList.add(practitioner.getId());
+		            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitioner.getId(), null);
+		            practitionerIdList.addAll(practitionerRaiseIdList);
+		        }
+        	}
         }
         List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(practitionerIdList);
         if (practitioners.isEmpty()) {
@@ -3285,11 +3289,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
     private void getMemberInfoForOnLine(Map<String, SubordinateSystemMemberInfo> memberInfoMap, Long practitionerId, Integer time) {
         //1、查询该团队长所在体系的所有成员
         List<Long> practitionerIdList = this.getPractitionerIdList(practitionerId, null);
-        AclPractitioner practitionerRaise = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
-        if (null != practitionerRaise && null != practitionerRaise.getRaiseId()) {
-            practitionerIdList.add(practitionerRaise.getId());
-            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitionerRaise.getId(), null);
-            practitionerIdList.addAll(practitionerRaiseIdList);
+        List<AclPractitioner> practitionerRaises = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+        if(practitionerRaises != null && practitionerRaises.size() > 0){
+        	for(AclPractitioner : practitionerRaise practitionerRaises){
+		        if (null != practitionerRaise && null != practitionerRaise.getRaiseId()) {
+		            practitionerIdList.add(practitionerRaise.getId());
+		            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitionerRaise.getId(), null);
+		            practitionerIdList.addAll(practitionerRaiseIdList);
+		        }
+        	}
         }
         List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerIdList);
         if (!practitionerList.isEmpty() && practitionerList.get(0) != null) {

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

@@ -317,11 +317,15 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
 
             // 获取团队成员或被辅导人的practitionerId
             List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,null);
-            AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
-            if(null != practitioner && null != practitioner.getRaiseId()){
-                practitionerIdList.add(practitioner.getId());
-                List<Long> practitionerRaiseIdList = practitionerService.getPractitionerIdList(practitioner.getId(),null);
-                practitionerIdList.addAll(practitionerRaiseIdList);
+            List<AclPractitioner> practitionerRaises = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+            if(practitionerRaises != null && practitionerRaises.size() > 0){
+            	for(AclPractitioner : practitioner practitionerRaises){
+		            if(null != practitioner && null != practitioner.getRaiseId()){
+		                practitionerIdList.add(practitioner.getId());
+		                List<Long> practitionerRaiseIdList = practitionerService.getPractitionerIdList(practitioner.getId(),null);
+		                practitionerIdList.addAll(practitionerRaiseIdList);
+		            }
+            	}
             }
 
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java

@@ -100,7 +100,8 @@ public interface AclPractitionerMapper {
     List<PayScaleInfo> queryEGHistorySalaryPDFByPractitionerId(Long practitionerId);
 
     public List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList);
-    public AclPractitioner findPractitionerByRaise(Long practitionerId);
+    
+    public List<AclPractitioner> findPractitionerByRaise(Long practitionerId);
     
     /**
      * 通过联合销售ID查询联合销售经纪人信息列表

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java

@@ -229,7 +229,7 @@ public interface AclPractitionerDALService {
      * @param practitionerId
      * @return
      */
-    AclPractitioner findPractitionerByRaise(Long practitionerId);
+    List<AclPractitioner> findPractitionerByRaise(Long practitionerId);
     
     /**
      * 通过联合销售ID查询联合销售经纪人信息列表

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java

@@ -334,7 +334,7 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     }
 
     @Override
-    public AclPractitioner findPractitionerByRaise(Long practitionerId) {
+    public List<AclPractitioner> findPractitionerByRaise(Long practitionerId) {
         return aclPractitionerMapper.findPractitionerByRaise(practitionerId);
     }