From d95758e09760671ed069c54e2f4f7e4f6f90f988 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 1 Jun 2022 14:20:10 +0800
Subject: [PATCH] =?UTF-8?q?branchlist=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partyOrg/service/impl/IcPartyOrgServiceImpl.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
index b0925ffd7d..789d94bbca 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -220,7 +221,12 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
         result.setValue(staffInfo.getAgencyId());
 //        result.setOrgPids(staffInfo.getAgencyPIds());
         result.setLabel(staffInfo.getAgencyName());
-        result.setChildren(baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId()));
+        //该行政组织下的所有类型为支部的党组织
+        List<BranchlistTreeSubDTO> orgList = baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId());
+        if(CollectionUtils.isEmpty(orgList)){
+            return new Result<List<BranchlistTreeDTO>>().ok(resultList);
+        }
+        result.setChildren(orgList);
         resultList.add(result);
         return new Result<List<BranchlistTreeDTO>>().ok(resultList);
     }