From 392f7a3134cb7a27a555bb1b3e2f3601c5eadde1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 15:06:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 9af2a01..7765f13 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -16,6 +16,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ext.ERPSyncService;
@@ -855,16 +856,19 @@
}
}
- private UserAddRequest getUserAddModel(Member c,String path,int type) {
+ public static UserAddRequest getUserAddModel(Member c,String path,int type) {
UserAddRequest model = new UserAddRequest();
model.setOrgIndexCode(c.getHkOrgId());
model.setJobNo(c.getCode());
- model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
+ model.setPhoneNo(c.getPhone());
+ if(StringUtils.isNotBlank(c.getIdcardNo())){
+ model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
+ }
model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
model.setPersonId(type == 0 ?UUID.randomUUID().toString().replace("-", ""):c.getHkId());
model.setGender(Constants.formatIntegerNum(c.getSex())+"");
model.setPersonName(c.getName());
- if(type== 0 && StringUtils.isNotBlank(c.getFaceImg())){
+ if(StringUtils.isNotBlank(c.getFaceImg())){
model.setFaces(new ArrayList<>());
UserAddFaceRequest face = new UserAddFaceRequest();
String imageBase = ImageBase64Util.Image2Base64(path+c.getFaceImg());
@@ -874,7 +878,6 @@
}
face.setFaceData(imageBase);
model.getFaces().add(face);
-
}
return model;
}
--
Gitblit v1.9.3