Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml

@@ -57,6 +57,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{deviceType}
                 </foreach>
             </if>
+            <if test="envSensorResultTypeList == null or envSensorResultTypeList.size() == 0">
+                AND !((kdsm.measure_code = 'temperature'
+                and kdsm.measure_type = 1
+                and kdsr.measure_data between kdsm.measure_min_value and kdsm.measure_max_value)
+                or (kdsm.measure_code = 'humidity'
+                and kdsm.measure_type = 1
+                and kdsr.measure_data between kdsm.measure_min_value and kdsm.measure_max_value)
+                or (kdsm.measure_code = 'smoke'
+                and kdsm.measure_type = 1
+                and kdsr.measure_data <![CDATA[ <= ]]> kdsm.measure_max_value)
+                )
+            </if>
             <if test="envSensorResultTypeList != null and envSensorResultTypeList.size() > 0">
                 and (
                 <foreach item="type" collection="envSensorResultTypeList" separator=" or ">