Merge branch 'cherry-pick-7869e114' into 'master_dev'

fix：pc端首页告警数sql错误 同步与小程序逻辑一致

See merge request yunteng/thingskit!340

@@ -296,11 +296,13 @@
     </select>
     </select>
 
 
     <select id="findDeviceAlarmInfoByCustomer" resultMap="baseHomePageTop">
     <select id="findDeviceAlarmInfoByCustomer" resultMap="baseHomePageTop">
-        SELECT COUNT(ID)                                                     AS sum_count,
-               SUM(CASE WHEN created_time >= #{todayTime} THEN 1 ELSE 0 END) AS today_add
-        FROM alarm
-        WHERE customer_id ::TEXT = #{customerId}
-          AND originator_type = 5;
+        SELECT COUNT(m.ID)                                                     AS sum_count,
+               SUM(CASE WHEN m.created_time >= #{todayTime} THEN 1 ELSE 0 END) AS today_add
+        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
+        WHERE bd.customer_id ::TEXT = #{customerId}
+          AND m.originator_type = 5;
     </select>
     </select>
 
 
     <select id="findDeviceMessageInfoByTs" resultType="java.lang.Integer">
     <select id="findDeviceMessageInfoByTs" resultType="java.lang.Integer">