Merge branch 'cherry-pick-f90cd70f' into 'master_dev'

fix：小程序首页统计信息 客户查询数量不正确

See merge request yunteng/thingskit!337

@@ -103,20 +103,24 @@
     </select>
     </select>
 
 
     <select id="countAlarms" resultMap="aggregationMap">
     <select id="countAlarms" resultMap="aggregationMap">
-        SELECT status ,COUNT(id) AS value FROM alarm
+        SELECT status , COUNT(m.id) AS value FROM alarm  m
+        <if test="queryMap.customerId !=null">
+            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
+        </if>
         <where>
         <where>
             1=1
             1=1
             <if test="queryMap.tenantId !=null">
             <if test="queryMap.tenantId !=null">
-                AND tenant_id= #{queryMap.tenantId}::uuid
+                AND m.tenant_id= #{queryMap.tenantId}::uuid
             </if>
             </if>
             <if test="queryMap.customerId !=null">
             <if test="queryMap.customerId !=null">
-                AND customer_id= #{queryMap.customerId}::uuid
+                AND bd.customer_id= #{queryMap.customerId}::uuid
             </if>
             </if>
-            <if test="queryMap.startTime !=null">
-                AND created_time >= #{queryMap.startTime}
+            <if test="queryMap.startTime !=null and queryMap.customerId ==null">
+                AND m.created_time >= #{queryMap.startTime}
             </if>
             </if>
-            <if test="queryMap.endTime !=null">
-                AND created_time &lt;  #{queryMap.endTime}
+            <if test="queryMap.endTime !=null and queryMap.customerId ==null">
+                AND m.created_time &lt;  #{queryMap.endTime}
             </if>
             </if>
         </where>
         </where>
         GROUP BY status;
         GROUP BY status;