From 01c13248f347b4bc7091fb70ba92d03676abaa8b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 11:30:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 33ea271..20c3a9f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -692,7 +692,7 @@
private boolean isDeletedLedDevice(Device device, List<LedRecordsInfoResponse> allHkList) {
if(allHkList.size()>0){
for(LedRecordsInfoResponse r : allHkList){
- if(StringUtils.equals(device.getDoorId(), r.getModel_data_id())){
+ if(StringUtils.equals(device.getHkId(), r.getModel_data_id())){
//琛ㄧず鏈垹闄�
return false;
}
@@ -704,7 +704,7 @@
private boolean isDeletedBroadcastDevice(Device device, List<FetchAudioChannelInfoResponse> allHkList) {
if(allHkList.size()>0){
for(FetchAudioChannelInfoResponse r : allHkList){
- if(StringUtils.equals(device.getDoorId(), r.getAudioChannelIndexCode())){
+ if(StringUtils.equals(device.getHkId(), r.getAudioChannelIndexCode())){
//琛ㄧず鏈垹闄�
return false;
}
--
Gitblit v1.9.3