F10设备sql适配筛选

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

@@ -65,7 +65,7 @@
         </if>
         and device_info.flag = 0
         <!-- 如果 categoryIdList 不包含 1011，才加 device_id 过滤 -->
-        <if test="categoryIdList == null or !categoryIdList.contains(1011)">
+        <if test="!categoryIdList.contains(1011)">
             and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003' or device_info.device_id LIKE '%\_131_5')
         </if>
         and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1