报警日历增加租户隔离

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmMapper.xml

@@ -111,12 +111,12 @@
             FROM
                 `base_alarm`
             WHERE
-                base_alarm.alarm_time >= #{startTime}
+                base_alarm.alarm_time >= #{startTime} AND base_alarm.tenant_id = #{tenantId}
             GROUP BY
                 DATE DESC
             ) _tmpAllTable
             WHERE
-               `date` BETWEEN #{startTime} AND #{endTime} AND tenant_id = #{tenantId}
+               `date` BETWEEN #{startTime} AND #{endTime}
         GROUP BY
             `date` DESC
     </select>