Merge remote-tracking branch 'remotes/origin/dev_public_join' into dev

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

@@ -147,6 +147,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
             UserJoinIndicatorGrowthRateResultDTO beforeTwoMonth = screenUserJoinDao.selectUserJoinDataByAreaCode(param.getAreaCode(), dateUtils.getPreviousMonthId(NumConstant.TWO));
             if (null == beforeTwoMonth) {
                 log.warn(String.format("平阴县查询screen_user_join表为空,monthId：%s",dateUtils.getPreviousMonthId(NumConstant.TWO)));
+                return new PublicPartiProfileResultDTO();
             }else{
                 //举例,today is 20210707 ，  latest是06月份的数据，beforeTwoMonth是05月份的数据