Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TdInfoQueryController.java

@@ -178,7 +178,9 @@ public class TdInfoQueryController extends BaseController {
         List<FanHealthIndex> fanHealthIndexIPage = fanHealthIndexMapper.getInfoByPage(dto);
         fanHealthIndexIPage.forEach(item -> {
             item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex())));
-            item.setAnalysisType(dto.getAnalysisType());
+            if (null != dto.getAnalysisType()){
+                item.setAnalysisType(dto.getAnalysisType());
+            }
         });
         Integer infoByPageTotal = fanHealthIndexMapper.getInfoByPageTotal(dto);
         resultPage.setRecords(fanHealthIndexIPage);
@@ -294,7 +296,9 @@ public class TdInfoQueryController extends BaseController {
         List<PvHealthIndex> pvHealthIndexIPage = pvHealthIndexMapper.getInfoByPage(dto);
         pvHealthIndexIPage.forEach(item -> {
             item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex())));
-            item.setAnalysisType(dto.getAnalysisType());
+            if (null != dto.getAnalysisType()){
+                item.setAnalysisType(dto.getAnalysisType());
+            }
         });
         Integer infoByPageTotal = pvHealthIndexMapper.getInfoByPageTotal(dto);
         resultPage.setRecords(pvHealthIndexIPage);