解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -1140,7 +1140,7 @@
         `idx_biz_fan_health_index`
         WHERE
         ANALYSIS_OBJ_TYPE = '测点'
-        <if test="startTime == null and startTime == '' and endTime == null and endTime == '' ">
+        <if test="(startTime == null or startTime == '' ) and (endTime == null or endTime =='')  ">
             AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 15 HOUR ) )
             OR ( REC_DATE >=DATE_SUB( NOW(), INTERVAL 15 DAY ) AND ANALYSIS_TYPE = '按天' )
             OR ( ANALYSIS_TYPE = '按时刻' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 150 MINUTE ) )