代码完善

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml

@@ -19,15 +19,15 @@
         INNER JOIN device_info dinfo ON dinfo.asset_id = basic_monitoring_asset.equipment_id
         INNER JOIN alert_history ah ON dinfo.device_id = ah.device_id
         LEFT JOIN basic_asset_class_big on basic_asset_class_big.id = basic_monitoring_asset.class_big_id
-        LEFT JOIN type ty ON dinfo.type_id = ty.id
+        LEFT JOIN type ty ON dinfo.type_id = ty.id AND ty.flag = 0
-		WHERE
-            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
-        AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0 AND basic_asset_class_big.flag = 0
-        AND ah.confirm_status = 0 AND ah.handle_status = 1
             AND ty.device_category_id in
             <foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")">
                 #{categoryId}
             </foreach>
+		WHERE
+            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
+        AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0 AND basic_asset_class_big.flag = 0
+        AND ah.confirm_status = 0 AND ah.handle_status = 1
 	</select>
 
     <select id="getBuildingInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewVO">