优化

src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -82,15 +82,17 @@ public class GyDataServiceImpl implements GyDataService {
             if(StringUtils.isEmpty(province)){
                 province = sysProvince;
             }
-            map.put("unitProvince", province);
+            if(!ObjectUtils.isEmpty(province)) {
+                map.put("unitProvince", province);
+            }
 
             String city = currUser.getCity();
             if(StringUtils.isEmpty(city)){
                 city = sysCity;
             }
-            map.put("unitCity", city);
 
             if(!ObjectUtils.isEmpty(city)){
+                map.put("unitCity", city);
                 map.put("auditStage", "1");
             } else {
                 map.put("auditStage", "2");
@@ -112,15 +114,17 @@ public class GyDataServiceImpl implements GyDataService {
             if(StringUtils.isEmpty(province)){
                 province = sysProvince;
             }
-            map.put("unitProvince", province);
+            if(!ObjectUtils.isEmpty(province)) {
+                map.put("unitProvince", province);
+            }
 
             String city = currUser.getCity();
             if(StringUtils.isEmpty(city)){
                 city = sysCity;
             }
-            map.put("unitCity", city);
 
             if(!ObjectUtils.isEmpty(city)){
+                map.put("unitCity", city);
                 map.put("auditStage", "1");
             } else {
                 map.put("auditStage", "2");
@@ -618,15 +622,18 @@ public class GyDataServiceImpl implements GyDataService {
             if(StringUtils.isEmpty(province)){
                 province = sysProvince;
             }
-            map.put("unitProvince", province);
+            if(!ObjectUtils.isEmpty(province)) {
+                map.put("unitProvince", province);
+            }
 
             String city = currUser.getCity();
             if(StringUtils.isEmpty(city)){
                 city = sysCity;
             }
-            map.put("unitCity", city);
+
 
             if(!ObjectUtils.isEmpty(city)){
+                map.put("unitCity", city);
                 map.put("auditStage", "1");
             } else {
                 map.put("auditStage", "2");
@@ -646,15 +653,17 @@ public class GyDataServiceImpl implements GyDataService {
             if(StringUtils.isEmpty(province)){
                 province = sysProvince;
             }
-            map.put("unitProvince", province);
+            if(!ObjectUtils.isEmpty(province)) {
+                map.put("unitProvince", province);
+            }
 
             String city = currUser.getCity();
             if(StringUtils.isEmpty(city)){
                 city = sysCity;
             }
-            map.put("unitCity", city);
 
             if(!ObjectUtils.isEmpty(city)){
+                map.put("unitCity", city);
                 map.put("auditStage", "1");
             } else {
                 map.put("auditStage", "2");

src/main/resources/static/js/demo/echarts-demo.js

@@ -279,8 +279,8 @@ function classificationChart(dateArray) {
                         data: [0, 0, 0, 0, 0, 0, 0],
                         markPoint: {
                             data: [
-                                {name: '年最高', value: 0, xAxis: 4, yAxis: 28,},
-                                {name: '年最低', value: 0, xAxis: 2, yAxis: 1}
+                                {name: '年最高', value: 0, xAxis: 0, yAxis: 0,},
+                                {name: '年最低', value: 0, xAxis: 2, yAxis: 0}
                             ]
                         },
                         /*markLine: {