From d1e55e8c1eecd46921ed43ad6525f37bb0593f07 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 24 五月 2024 18:13:36 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 a6ea67e..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
@@ -861,12 +861,14 @@
         model.setOrgIndexCode(c.getHkOrgId());
         model.setJobNo(c.getCode());
         model.setPhoneNo(c.getPhone());
-        model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
+        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());

--
Gitblit v1.9.3