From 05709d6c78e27507192bc41cb10dcdf20dc98514 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 九月 2024 15:05:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
index 6fc54ed..4935818 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
@@ -183,7 +183,7 @@
private List<PlatformDevice> getCameraList(List<PlatformCameraInfoResponse> cameras, Platform model) {
List<PlatformDevice> list = new ArrayList<>();
- if(cameras!=null || cameras.size()>0){
+ if(cameras!=null && cameras.size()>0){
for(PlatformCameraInfoResponse param :cameras){
PlatformDevice d = new PlatformDevice();
d.setCreateDate(model.getCreateDate());
--
Gitblit v1.9.3