我的团队信息，战队业绩信息调整，显示育成人信息

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

@@ -2324,6 +2324,8 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
         AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
         if(null != practitioner && null != practitioner.getRaiseId()){
         if(null != practitioner && null != practitioner.getRaiseId()){
             practitionerIdList.add(practitioner.getId());
             practitionerIdList.add(practitioner.getId());
+            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitioner.getId(),null);
+            practitionerIdList.addAll(practitionerRaiseIdList);
         }
         }
         List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(practitionerIdList);
         List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(practitionerIdList);
         if (practitioners.isEmpty()){
         if (practitioners.isEmpty()){
@@ -3058,6 +3060,8 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         AclPractitioner practitionerRaise = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
         AclPractitioner practitionerRaise = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
         if(null != practitionerRaise && null != practitionerRaise.getRaiseId()){
         if(null != practitionerRaise && null != practitionerRaise.getRaiseId()){
             practitionerIdList.add(practitionerRaise.getId());
             practitionerIdList.add(practitionerRaise.getId());
+            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitionerRaise.getId(),null);
+            practitionerIdList.addAll(practitionerRaiseIdList);
         }
         }
         List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerIdList);
         List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerIdList);
         if(!practitionerList.isEmpty() && practitionerList.get(0) != null){
         if(!practitionerList.isEmpty() && practitionerList.get(0) != null){

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

@@ -320,6 +320,8 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
             AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
             AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
             if(null != practitioner && null != practitioner.getRaiseId()){
             if(null != practitioner && null != practitioner.getRaiseId()){
                 practitionerIdList.add(practitioner.getId());
                 practitionerIdList.add(practitioner.getId());
+                List<Long> practitionerRaiseIdList = practitionerService.getPractitionerIdList(practitioner.getId(),null);
+                practitionerIdList.addAll(practitionerRaiseIdList);
             }
             }
 
 
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC

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

@@ -5,6 +5,7 @@ import com.yd.api.practitioner.service.PractitionerService;
 import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
 import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
 import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;
 import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;
 import com.yd.dal.entity.customer.AclCustomer;
 import com.yd.dal.entity.customer.AclCustomer;
+import com.yd.dal.entity.customer.AclPractitionerSubordinateSystem;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitioner;
@@ -15,6 +16,7 @@ import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
 import com.yd.dal.mapper.customer.AclCustomerMapper;
 import com.yd.dal.mapper.customer.AclCustomerMapper;
 import com.yd.dal.mapper.customer.AclPractitionerMapper;
 import com.yd.dal.mapper.customer.AclPractitionerMapper;
 import com.yd.dal.service.customer.AclPractitionerDALService;
 import com.yd.dal.service.customer.AclPractitionerDALService;
+import com.yd.dal.service.customer.AclPractitionerSubordinateSystemDALService;
 import com.yd.util.CommonUtil;
 import com.yd.util.CommonUtil;
 import com.yd.util.auth.setting.AudienceSetting;
 import com.yd.util.auth.setting.AudienceSetting;
 import com.yd.util.auth.setting.JwtTokenUtil;
 import com.yd.util.auth.setting.JwtTokenUtil;
@@ -46,6 +48,8 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     PractitionerService practitionerService;
     PractitionerService practitionerService;
     @Autowired
     @Autowired
     private AclPractitionerDALService aclPractitionerDALService;
     private AclPractitionerDALService aclPractitionerDALService;
+    @Autowired
+    private AclPractitionerSubordinateSystemDALService aclPractitionerSubordinateSystemDalService;
     @Override
     @Override
     public AclPractitioner findByCustomerIdIsActive(Long customerId, int isActive) {
     public AclPractitioner findByCustomerIdIsActive(Long customerId, int isActive) {
         return aclPractitionerMapper.findByCustomerIdIsActive(customerId,isActive);
         return aclPractitionerMapper.findByCustomerIdIsActive(customerId,isActive);
@@ -279,10 +283,15 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
             //我的团队，特殊处理
             //我的团队，特殊处理
             if(null != flag){
             if(null != flag){
                 AclPractitioner practitioner1 = aclPractitionerMapper.selectByMobileNo(userId);
                 AclPractitioner practitioner1 = aclPractitionerMapper.selectByMobileNo(userId);
+                //育成人 特殊处理
                 List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerService.getPractitionerIdList(practitioner1.getId(),null));
                 List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerService.getPractitionerIdList(practitioner1.getId(),null));
                 if(null != practitioner.getRaiseId()){
                 if(null != practitioner.getRaiseId()){
                     practitionerList.add(practitioner);
                     practitionerList.add(practitioner);
                 }
                 }
+                AclPractitionerSubordinateSystem aclPractitionerSubordinateSystem =aclPractitionerSubordinateSystemDalService.findById(practitioner.getSubordinateSystemId());
+                if(null != aclPractitionerSubordinateSystem && aclPractitionerSubordinateSystem.getOwnerPractitionerId() != null){
+                    practitionerList.add(practitioner);
+                }
                 if(null != practitionerList && practitionerList.size() > 0){
                 if(null != practitionerList && practitionerList.size() > 0){
                     for(AclPractitioner acl:practitionerList){
                     for(AclPractitioner acl:practitionerList){
                         if(practitioner.getCustomerId().equals(acl.getCustomerId())){
                         if(practitioner.getCustomerId().equals(acl.getCustomerId())){