Merge branch '20230914' into 'master_dev'

20230914

See merge request yunteng/thingskit!234

@@ -41,9 +41,13 @@
         SELECT d.name AS device_name,d.alias AS device_alias,d.id device_id,m.*,d.organization_id,org.name organization_name
         FROM alarm m
         LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid
+        LEFT JOIN device bd ON bd.id = d.tb_device_id::uuid
         LEFT JOIN tk_organization org ON org.id = d.organization_id
         <where>
             m.tenant_id = #{tenantId}
+            <if test="customerId!=null">
+                AND bd.customer_id = #{customerId}
+            </if>
             <if test="severity!=null">
                 AND severity = #{severity}
             </if>
@@ -51,10 +55,10 @@
                 AND type LIKE CONCAT('%',#{alarmType},'%')
             </if>
             <if test="startTime!=null">
-                AND created_time >= #{startTime}
+                AND m.created_time >= #{startTime}
             </if>
             <if test="endTime!=null">
-                AND created_time 	&lt;= #{endTime}
+                AND m.created_time 	&lt;= #{endTime}
             </if>
             <if test="status!=null">
                 AND status IN