From 20b31fd842d5fe02544b6d49a54f43c83c714972 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 10:35:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B9=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcCommunitySelfOrganizationServiceImpl.java | 5 ++++-
 .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java  | 5 ++++-
 .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index 5a5cd89fe0..c73d8dff56 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -401,7 +401,10 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
 
     @Override
     public List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds) {
-        return baseDao.selectBatchIds(communityOrgIds);
+        if(CollectionUtils.isNotEmpty(communityOrgIds)){
+            return baseDao.selectBatchIds(communityOrgIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 7f18773e78..4141ceb9b6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -454,7 +454,10 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Override
     public List<IcPartyUnitEntity> queryListById(List<String> partyUnitIds) {
-        return baseDao.selectBatchIds(partyUnitIds);
+        if(CollectionUtils.isNotEmpty(partyUnitIds)){
+            return baseDao.selectBatchIds(partyUnitIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
     private String getServiceMatter(Map<String, String> map, String matter) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
index 5827a15107..52193bb4df 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
@@ -270,7 +270,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
 
     @Override
     public List<IcSocietyOrgEntity> queryListById(List<String> socialOrgIds) {
-        return baseDao.selectBatchIds(socialOrgIds);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(socialOrgIds)){
+            return baseDao.selectBatchIds(socialOrgIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
 }
\ No newline at end of file