Merge branch 'wxz_online_bugfix' into release_temp

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 {

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.根据组织级别判断查询直属组织或网格列表

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -112,7 +112,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);
         }