From 611e8f7f1986e96980712a083d06b7cfe45f928c Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 16 十月 2024 11:03:58 +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/HkSyncPushServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java index e0b6ba6..db4a384 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java @@ -199,7 +199,7 @@ .eq(Device::getDoorId,request.getSrcIndex()) .eq(Device::getIsdeleted,Constants.ZERO) .last("limit 1" )); - if(d!=null && !Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){ + if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){ if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){ //濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰� inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘 @@ -208,9 +208,9 @@ } } if(member !=null){ - if(d!=null && !Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){ + if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){ delRetentionLis.add(member.getId()); - if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){ + if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){ //濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰� retentionList.add(getRetentionModelByRequest(member,request)); if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){ -- Gitblit v1.9.3