fix: 修复查询人员时,组织机构层级等于3层时,获取的集合数量错误导致接口报错无法选择人的BUG
This commit is contained in:
+6
-4
@@ -288,16 +288,18 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
|
|||||||
List<TsInstitution> tsInstitutions = new ArrayList<>();
|
List<TsInstitution> tsInstitutions = new ArrayList<>();
|
||||||
List<TsInstitution> institutions = getTopChild(map,userVO.getInstitutionId(),topNum,tsInstitutions);
|
List<TsInstitution> institutions = getTopChild(map,userVO.getInstitutionId(),topNum,tsInstitutions);
|
||||||
if(!institutions.isEmpty()){
|
if(!institutions.isEmpty()){
|
||||||
if(institutions.size() >= topNum){
|
if(institutions.size() > topNum){
|
||||||
userVO.setTopUnitId(institutions.get(topNum).getId());
|
userVO.setTopUnitId(institutions.get(topNum).getId());
|
||||||
userVO.setTopUnit(institutions.get(topNum).getName());
|
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 {
|
}else {
|
||||||
userVO.setTopUnitId(institutions.get(institutions.size()-1).getId());
|
userVO.setTopUnitId(institutions.get(institutions.size()-1).getId());
|
||||||
userVO.setTopUnit(institutions.get(institutions.size()-1).getName());
|
userVO.setTopUnit(institutions.get(institutions.size()-1).getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user