From 9c1304920d6c83f7203b5302a8b620488effca09 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 12:26:35 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index fa844b1..77ff7fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3435,7 +3435,12 @@
         }
         List<UserProportion> userProportions = userDao.userAnalysis(type, date, streetId,areaCode);
         List<UserRateAnalysisVO> userRateAnalysisVOList=new ArrayList<>();
-        final Boolean monthRange=range.equals(1);
+        Boolean monthRange=false;
+        if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(range)){
+            if (range.equals(1)){
+                monthRange=true;
+            }
+        }
         if (userProportions.size()>0){
             for (UserProportion userProportion : userProportions) {
                 if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(userProportion)){
@@ -3467,6 +3472,7 @@
         return R.ok(userRate);
     }
 
+
     @Override
     public R realUser(Integer type, Long streetId, Long areaCode, Integer range) {
         IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();

--
Gitblit v1.7.1