From acf91a92691435b05a4c8cc48a3108f2f3ae1a04 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Tue, 30 Jun 2020 10:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7summaryInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/user/impl/UserAnalysisServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
index 707eec34f6..6db2f80497 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
@@ -90,14 +90,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             //注册用户
             userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId);
         }
-        if(null!=userSummaryInfoResultDTO){
+        if (userSummaryInfoResultDTO == null){
+            return new UserSummaryInfoResultDTO();
+        }
             userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),"."));
             //提取出工具类
             String partyMemberProStr=userSummaryInfoResultDTO.getPartymemberProportionValue().setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
             userSummaryInfoResultDTO.setPartymemberProportion(partyMemberProStr.concat("%"));
             String warmProStr=userSummaryInfoResultDTO.getWarmHeartedProportionValue().setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
             userSummaryInfoResultDTO.setWarmHeartedProportion(warmProStr.concat("%"));
-        }
         logger.info(String.format("查询用户汇总信息返参%s",JSON.toJSONString(userSummaryInfoResultDTO)));
        return userSummaryInfoResultDTO;
     }