From f65b37919af7cff2333f314d88d179251e795f4d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 30 Sep 2021 10:29:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAerror=E6=96=87=E6=A1=88bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/impl/EvaluationIndexServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index ea95c436a8..abb0f137f5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -167,7 +167,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         //1.查询组织信息
         ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
         if (dto == null) {
-            log.error(String.format("组织信息不存在,组织Id->%s"), agencyId);
+            log.error(String.format("组织信息不存在,组织Id->%s", agencyId));
             return new ScreenAgencyOrGridListDTO();
         }
         //2.根据组织级别判断查询直属组织或网格列表

From 997687e15ef2ef5ea11048313d613de2ccc561e0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 30 Sep 2021 16:15:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 26fed9cca7..f1b7e8f04f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -111,7 +111,7 @@ public class IssueProjectTagDictRedis {
         if (!CollectionUtils.isEmpty(_default)) {
             result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, _default);
         } else {
-            log.error("there is no default tag data in database , customerId : {},category:{}", customerId, ifOtherOnly ? null : category);
+            log.warn("there is no default tag data in database , customerId : {},category:{}", customerId, ifOtherOnly ? null : category);
         }
 
 

From 6e2259ec9400cb1543d8eeb353125ee99210badc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 30 Sep 2021 18:18:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 8 ++++----
 1 file changed, 4 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 a958594b83..33f1c36c49 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
@@ -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 {