From 048d346be8a2e6cccc217cb140976d9f678c88f5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 25 四月 2024 09:13:17 +0800
Subject: [PATCH] 最新版本
---
.gitignore | 1 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index e7328c7..c58f202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
/dist
.idea/
server/.idea/
-*.xml
*.class
target/
# Mobile Tools for Java (J2ME)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index cc23ef9..e374a31 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -555,7 +555,7 @@
List<Empower> faceErrorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
- if((Constants.equalsInteger(c.getMemberDeleted(),1) &&
+ if((Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE))
|| Constants.equalsInteger(c.getDeviceDeleted(),1)){
//濡傛灉浜哄摗鎴栬�呰ō鍌欏垹闄わ紝鍙栨秷涓嬪彂
@@ -794,7 +794,8 @@
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Member::getFaceStatus,Empower::getMemberFaceStatus);
- queryWrapper.selectAs(Device::getOnline,Empower::getDeviceOnline);
+ queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberFaceStatus);
+ queryWrapper.selectAs(Device::getOnline,Empower::getMemberHkStatus);
queryWrapper.selectAs(Device::getIsdeleted,Empower::getDeviceDeleted);
queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
--
Gitblit v1.9.3