From ca80c502a4c7a16ca672d5d7be61b5a29be96983 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 10:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87ID=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partyOrg/service/impl/IcPartyActServiceImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index e9d4cbedca..e5ecaf20a4 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -463,11 +463,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         }
         formDTO.setAgencyId(staffInfo.getAgencyId());
         if (!formDTO.getSearchType().equals("yearSearch")){
-            IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
-            if (null == icPartyOrgDTO){
-                throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
+            if (StringUtils.isNotBlank(formDTO.getOrgId())){
+                IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
+                if (null == icPartyOrgDTO){
+                    throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
+                }
+                formDTO.setPath(StringUtils.isBlank(icPartyOrgDTO.getOrgPid()) || icPartyOrgDTO.getOrgPid().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
             }
-            formDTO.setPath(StringUtils.isBlank(icPartyOrgDTO.getOrgPid()) || icPartyOrgDTO.getOrgPid().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
         }
 
     }