From a38fdd9386498594b7b5c226f3ddb985079b050b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 08 一月 2024 09:36:28 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 5675fc4..b783c96 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
@@ -361,7 +361,11 @@
Member member = new Member();
BeanUtils.copyProperties(param,member);
member.setCreateDate(new Date());
- member.setHkStatus(Constants.ZERO);
+ if(StringUtils.isBlank(param.getFaceImg())){
+ member.setHkStatus(Constants.THREE);
+ }else{
+ member.setHkStatus(Constants.ZERO);
+ }
member.setErpStatus(Constants.ONE);
member.setErpDate(new Date());
member.setErpId(param.getId());
@@ -371,7 +375,6 @@
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setHkStatus(Constants.ZERO);
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
@@ -783,8 +786,6 @@
}
}
-
-
@Override
public void userUpdate(UserUpdateRequest param){
try{
@@ -874,7 +875,6 @@
}
}
}
-
/**
* //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
* @param member
@@ -891,6 +891,9 @@
if(doorIds==null || doorIds.size() == 0){
return;
}
+ if(StringUtils.isBlank(member.getFaceImg())){
+ return;
+ }
List<Empower> list = new ArrayList<>();
List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
if(deviceList == null || deviceList.size() == 0){
@@ -905,6 +908,8 @@
model.setSendStatus(Constants.ZERO);
model.setStartTime(startTime);
model.setEndTime(endTime);
+ //榛樿缁欎簬铏氭嫙鍗�
+ model.setCardNos(Constants.VIRTUAL_CARD_INDEX+member.getId());
model.setSendType(Constants.ZERO);
list.add(model);
}
--
Gitblit v1.9.3