Merge pull request #1270 from hexq/playback

Playback
2024-03-05 10:41:22 +08:00
parent bd4598e676 7055c53192
commit 5bf87ca330
2 changed files with 17 additions and 8 deletions
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
@@ -136,7 +136,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
                    deviceChannelList.add(deviceChannel);
                }
                return deviceChannelList;
-            } else if (catalog == null || !catalogId.equals(platform.getDeviceGBId())) {
+            } else if (catalog == null && !catalogId.equals(platform.getDeviceGBId())) {
                logger.warn("未查询到目录{}的信息", catalogId);
                return null;
            }