From 5772d3f2315a70770cc357456a4a532c7130d2aa Mon Sep 17 00:00:00 2001
From: koisi <kor.coeo@gmail.com>
Date: 星期一, 05 八月 2024 18:59:02 +0800
Subject: [PATCH] 修复 87c071:合并271分支 的参数遗漏
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
index 0412fc8..35028df 100755
--- 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 @@
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;
}
@@ -164,7 +164,7 @@
return 0;
}
if (ObjectUtils.isEmpty(catalogId)) {
- catalogId = null;
+ catalogId = null;
}
List<DeviceChannel> deviceChannels = platformChannelMapper.queryAllChannelInCatalog(platformId, catalogId);
--
Gitblit v1.8.0