Merge remote-tracking branch 'origin/dev_question_naire' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -51,7 +51,6 @@ import com.epmet.dataaggre.dto.epmettduck.result.*;
 import com.epmet.dataaggre.dto.epmettduck.struct.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
-import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
@@ -71,8 +70,6 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -193,7 +190,10 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
                 orgIds = joint(pids,agencyId,gridList);
             }else {
-                String selfOrg = pids + ":" + agencyId;
+                String selfOrg = agencyId;
+                if (StringUtils.isNotBlank(pids)){
+                    selfOrg = pids + ":" + agencyId;
+                }
                 orgIds.add(selfOrg);
             }
         }else {
@@ -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;
     }