From f70b6a96274205c20674c5c6d826144af4cd0f41 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Aug 2022 15:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPartyActServiceImpl.java   |  6 +++
 .../service/impl/IcPartyOrgServiceImpl.java   | 41 ++++++++++---------
 2 files changed, 27 insertions(+), 20 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 625c1ec995..2429bc8334 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
@@ -181,6 +181,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
 
         //!!!!!!!不用前端传的了。 我自己查询吧
         IcPartyOrgInfo icPartyOrgInfo=SpringContextUtils.getBean(IcPartyOrgService.class).queryIcPartyOrgInfo(formDTO.getPublishPartyOrgId());
+        if (null == icPartyOrgInfo || StringUtils.isBlank(icPartyOrgInfo.getPartyOrgIdPath())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "党组织信息查询异常", "党组织信息查询异常");
+        }
         icPartyActEntity.setPublishOrgPath(icPartyOrgInfo.getPartyOrgIdPath());
 
         AgencyInfoCache agencyInfoCache= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
@@ -225,6 +228,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             joinOrg.setIcPartyActId(icPartyActEntity.getId());
             //!!!!!!!不用前端传的了。 我自己查询吧
             IcPartyOrgInfo joinPartyOrgInfo=SpringContextUtils.getBean(IcPartyOrgService.class).queryIcPartyOrgInfo(joinOrg.getId());
+            if (null == joinPartyOrgInfo || StringUtils.isBlank(joinPartyOrgInfo.getPartyOrgIdPath())) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "党组织信息查询异常", "党组织信息查询异常");
+            }
             joinOrg.setJoinOrgPath(joinPartyOrgInfo.getPartyOrgIdPath());
             icPartyActOrgDao.insert(joinOrg);
         });
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 4bc04cfd3a..8ead407a81 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
@@ -410,30 +410,31 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
      */
     @Override
     public IcPartyOrgInfo queryIcPartyOrgInfo(String icPartyOrgId) {
+        IcPartyOrgEntity orgEntity=baseDao.selectById(icPartyOrgId);
+        if (null == orgEntity) {
+            return null;
+        }
         IcPartyOrgInfo orgInfo=new IcPartyOrgInfo();
         orgInfo.setId(icPartyOrgId);
-        IcPartyOrgEntity orgEntity=baseDao.selectById(icPartyOrgId);
-        if (null != orgEntity) {
-            orgInfo.setOrgPid(orgEntity.getOrgPid());
-            orgInfo.setPartyOrgName(orgEntity.getPartyOrgName());
-            if(StringUtils.isBlank(orgEntity.getOrgPid())||NumConstant.ZERO_STR.equals(orgEntity.getOrgPid())){
-                //一级党组织直接返回
-                orgInfo.setPartyOrgIdPath(orgEntity.getId());
-                orgInfo.setPartyOrgNamePath(orgEntity.getPartyOrgName());
-                return orgInfo;
-            }
-            List<String> pids=new ArrayList<>();
-            pids.add(icPartyOrgId);
+        orgInfo.setOrgPid(orgEntity.getOrgPid());
+        orgInfo.setPartyOrgName(orgEntity.getPartyOrgName());
+        if(StringUtils.isBlank(orgEntity.getOrgPid())||NumConstant.ZERO_STR.equals(orgEntity.getOrgPid())){
+            //一级党组织直接返回
+            orgInfo.setPartyOrgIdPath(orgEntity.getId());
+            orgInfo.setPartyOrgNamePath(orgEntity.getPartyOrgName());
+            return orgInfo;
+        }
+        List<String> pids=new ArrayList<>();
+        pids.add(icPartyOrgId);
 
-            List<String> names=new ArrayList<>();
-            names.add(orgEntity.getPartyOrgName());
+        List<String> names=new ArrayList<>();
+        names.add(orgEntity.getPartyOrgName());
 
-            Map<String,String> map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid());
-            String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR;
-            String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR;
-            orgInfo.setPartyOrgIdPath(partyOrgIdPath);
-            orgInfo.setPartyOrgNamePath(partyOrgNamePath);
-        }
+        Map<String,String> map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid());
+        String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR;
+        String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR;
+        orgInfo.setPartyOrgIdPath(partyOrgIdPath);
+        orgInfo.setPartyOrgNamePath(partyOrgNamePath);
         return orgInfo;
     }