From 9ab109b9ee96e7ff2bf2b935a044aee5842a3ddc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期日, 28 九月 2025 10:08:09 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
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 2bbdd90..550868e 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
@@ -16,9 +16,10 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.MemberCardMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -544,7 +545,8 @@
List<Empower> faceErrorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
- if((Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
+ if((Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO) &&
+ Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE))
|| Constants.equalsInteger(c.getDeviceDeleted(),1)){
//濡傛灉浜哄摗鎴栬�呰ō鍌欏垹闄わ紝鍙栨秷涓嬪彂
@@ -552,7 +554,8 @@
continue;
}
if(Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE)
- && Constants.equalsInteger(c.getIsdeleted(),1)){
+ && Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE)
+ && Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO)){
//濡傛灉浜哄憳宸茬鑱岋紝鏂板鎺堟潈鏃犻渶涓嬪彂锛屽彇娑堜笅鍙�
cacenList.add(c);
continue;
@@ -789,8 +792,8 @@
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Member::getFaceStatus,Empower::getMemberFaceStatus);
- queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberFaceStatus);
- queryWrapper.selectAs(Device::getOnline,Empower::getMemberHkStatus);
+ queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
+ queryWrapper.selectAs(Device::getOnline,Empower::getDeviceOnline);
queryWrapper.selectAs(Device::getIsdeleted,Empower::getDeviceDeleted);
queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
--
Gitblit v1.9.3