From 7894e9d88eee38c7af9c7ab3a9c82c682dd0f72e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 8 Oct 2021 09:48:08 +0800
Subject: [PATCH] =?UTF-8?q?pids=E4=B8=BA=E7=A9=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/impl/PrUserProjectServiceImpl.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 33f1c36c49..56d4512f97 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -274,10 +274,17 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      */
     public List<String> joint(String pids, String agencyId, List<IdAndNameDTO> list){
         List<String> orgIds = new ArrayList<>();
-        list.forEach(l -> {
-            String oneOrg = pids + ":" + agencyId + ":" + l.getId();
-            orgIds.add(oneOrg);
-        });
+        if (StringUtils.isNotBlank(pids)){
+            list.forEach(l -> {
+                String oneOrg = pids + ":" + agencyId + ":" + l.getId();
+                orgIds.add(oneOrg);
+            });
+        }else {// pids为空的时候
+            list.forEach(l -> {
+                String oneOrg = agencyId + ":" + l.getId();
+                orgIds.add(oneOrg);
+            });
+        }
         return orgIds;
     }