diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml
index 6ea7168..c0b6462 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml
@@ -20,7 +20,9 @@
         WHERE
             dinfo.flag != 1 AND basic_monitoring_asset.flag != 1
         AND basic_space.flag != 1 AND basic_floor.flag != 1 AND basic_building.flag != 1
-        AND basic_building.building_id = #{buildingId}
+        <if test="buildingId != null">
+            AND basic_building.building_id = #{buildingId}
+        </if>
         AND dinfo.company_id IN <foreach collection="companyIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             and ty.device_category_id in
diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml
index a6d2fcd..47bb0d8 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml
@@ -26,7 +26,7 @@
             </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 basic_monitoring_asset.flag = 0 AND dinfo.flag = 0
         AND ah.confirm_status = 0 AND ah.handle_status = 1
 	</select>
 
diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java
index c0f302c..565b72c 100644
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java
+++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java
@@ -196,6 +196,7 @@ public class OverviewServiceImpl implements OverviewService {
 
 			// 分组监测点分类
 			List<OverviewVO.MonitoringPointCategoryAlarm> categoryAlarms = buildingInfos.stream()
+					.filter(dto -> dto.getMonitoringPointCategoryId() != null)
 					.collect(Collectors.groupingBy(OverviewInfo::getMonitoringPointCategoryId))
 					.entrySet()
 					.stream()