Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -86,7 +86,11 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
-       return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
+        PartymemberAgeDistributionResultDTO ageInfo = screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
+        if(null == ageInfo){
+            ageInfo = new PartymemberAgeDistributionResultDTO();
+        }
+        return ageInfo;
     }
 
     /**

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@@ -139,7 +139,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.datareport.dao.group" level="DEBUG"/>