From e992f6c13602feadd60f9df16c65ffccc1cdcb6a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:35 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..09da7f9 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
@@ -477,7 +477,7 @@
}
if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){
-// && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
+// && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚�
List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚�
//濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛�
@@ -518,7 +518,7 @@
.eq(Empower::getMemberId,member.getId())
.eq(Empower::getIsdeleted,Constants.ZERO)
.in(Empower::getDeviceId,deviceIds) );
- empowerMapper.insertBatchSomeColumn(list);
+ empowerMapper.insert(list);
}
}
}
@@ -544,7 +544,7 @@
List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚�
List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚�
if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)
- && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
+ && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
//濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛�
List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,addDoorIds));
if(deviceList == null || deviceList.size() == 0){
@@ -577,7 +577,7 @@
.eq(Empower::getMemberId,member.getId())
.eq(Empower::getIsdeleted,Constants.ZERO)
.in(Empower::getDeviceId,deviceIds) );
- empowerMapper.insertBatchSomeColumn(list);
+ empowerMapper.insert(list);
}
}
@@ -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