Merge remote-tracking branch 'remotes/origin/master_bugfix'

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -224,8 +224,9 @@ public class FactIndexServiceImpl implements FactIndexService {
         if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
             //3.根据组织Id查询组织信息
             CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
+            log.debug("monthScoreList search agency result:{}", JSON.toJSONString(agency));
             if (null == agency) {
-                //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
+                log.warn(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
                 return resultList;
             }
             //4.根据组织级别判断查询哪类数据表
@@ -233,13 +234,15 @@ public class FactIndexServiceImpl implements FactIndexService {
             if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexAgencyScoreDao.selectAgencyMonthWeightScoreList(formDTO);
-
+                log.debug("monthScoreList search selectAgencyMonthWeightScoreList result:{}", JSON.toJSONString(list));
                 //社区级
             } else if ("community".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexCommunityScoreDao.selectCommunityMonthWeightScoreList(formDTO);
+                log.debug("monthScoreList search selectCommunityMonthWeightScoreList result:{}", JSON.toJSONString(list));
             } else {
-                //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+                log.warn(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+                log.debug("monthScoreList search othoer result:{}", JSON.toJSONString(list));
                 return resultList;
             }
             //网格层级数据