diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 97634dcc..f702d402 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -294,15 +294,16 @@ public class ProvinceService implements IProvinceService { CompeteCoachExample competeCoachExample = new CompeteCoachExample(); competeCoachExample.createCriteria().andCompanyIdEqualTo(company); List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); - ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); + List competeCompanyCoachList = new ArrayList(); - ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); + List competeCompanyLeadersList = new ArrayList(); ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyHeadList = new ProvinceCompeteVo.CompeteCompanyHeadList(); if (CollectionUtil.isNotEmpty(competeCoachList)){ for (CompeteCoach competeCoach : competeCoachList){ if (competeCoach.getIdentity() == 0){ //给领队赋值 + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); competeCompanyCoach.setCoachName(competeCoach.getName()); competeCompanyCoach.setCoachId(competeCoach.getId()); competeCompanyCoach.setGender(competeCoach.getGender()); @@ -312,6 +313,7 @@ public class ProvinceService implements IProvinceService { }else { //给教练赋值 + ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); competeCompanyLeader.setGuideName(competeCoach.getName()); competeCompanyLeader.setGuideId(competeCoach.getId()); competeCompanyLeader.setGender(competeCoach.getGender()); @@ -436,7 +438,11 @@ public class ProvinceService implements IProvinceService { @Override public void updateLeader(ProvinceCompeteDto.ModifyLeader param) { - Long coachId=param.getCoachId(); + Long coachId = param.getCoachId(); +// Long companyId = param.getCompanyId(); +// CompeteCoachExample competeCoachExample = new CompeteCoachExample(); +// competeCoachExample.createCriteria().andCompanyIdEqualTo(companyId); +// List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); if(ObjectUtil.isNull(coachId)){ CompeteCoach competeCoach=new CompeteCoach(); competeCoach.setId(snowflake.nextId());