From abdff752091477e181666ff77f25691ace1877a5 Mon Sep 17 00:00:00 2001 From: zyd Date: Wed, 10 Aug 2022 08:11:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=97=B6=EF=BC=8C=E7=BB=84=E7=BB=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=B1=82=E7=BA=A7=E7=AD=89=E4=BA=8E3=E5=B1=82?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=9A=84=E9=9B=86=E5=90=88?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=BA=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TsInstitutionServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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; }