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 joint(String pids, String agencyId, List list){ List 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; }