From 42ef653f816915dcdcc009d5717cf65135ac1fd8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:54:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 36112b7..a71078c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -627,10 +627,10 @@
queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
- queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
+ queryWrapper.selectAs(DeviceEvent::getHappenTime,DoorEventListResponse::getCreateTime);
queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
- queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
+ queryWrapper.selectAs(Member::getErpOrgId,DoorEventListResponse::getOrgId);
queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);
if(!Objects.isNull(doorEventListRequest)){
@@ -808,7 +808,7 @@
||Objects.isNull(param.getIdType())//璇佷欢绫诲瀷
||Objects.isNull(param.getSex())//鎬у埆
||Objects.isNull(param.getOrgId())//鎵�灞炵粍缁囩紪鐮�
- ||StringUtils.isBlank(param.getFaceImg())//浜鸿劯鐓х墖
+// ||StringUtils.isBlank(param.getFaceImg())//浜鸿劯鐓х墖
||StringUtils.isBlank(param.getCode())//宸ュ彿
||StringUtils.isBlank(param.getPhone())//鎵嬫満鍙�
){
@@ -857,6 +857,8 @@
member.setStartTime(param.getValidStartTime());
member.setEndTime(param.getValidEndTime());
memberMapper.updateById(member);
+ //鍒犻櫎鐢ㄦ埛鍗＄墖鏁版嵁 浜哄憳瑙掕壊鍏宠仈
+// memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
}
//娣诲姞浜哄憳鍗＄墖鏁版嵁
getRoleIdByParam(param.getRoleIds(),member);
--
Gitblit v1.9.3