diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 217f872f..1e660d8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -288,16 +288,18 @@ public class TsInstitutionServiceImpl extends ServiceImpl tsInstitutions = new ArrayList<>(); List institutions = getTopChild(map,userVO.getInstitutionId(),topNum,tsInstitutions); if(!institutions.isEmpty()){ - if(institutions.size() >= topNum){ + if(institutions.size() > topNum){ userVO.setTopUnitId(institutions.get(topNum).getId()); userVO.setTopUnit(institutions.get(topNum).getName()); + }else if(institutions.size() == topNum){ + userVO.setTopUnitId(institutions.get(topNum-1).getId()); + userVO.setTopUnit(institutions.get(topNum-1).getName()); }else { - userVO.setTopUnitId(institutions.get(institutions.size()-1).getId()); - userVO.setTopUnit(institutions.get(institutions.size()-1).getName()); + userVO.setTopUnitId(institutions.get(institutions.size()-1).getId()); + userVO.setTopUnit(institutions.get(institutions.size()-1).getName()); } } } - } return res; }