|
@@ -525,7 +525,10 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
|
|
SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
|
|
.eq(SysUserExtRecord::getUserId, userId)
|
|
.eq(SysUserExtRecord::getUserId, userId)
|
|
.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val()));
|
|
.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val()));
|
|
- if (userExtRecord == null && !SubjectLocation.REN_LI_JIA.equals(userSignCertDTO.getSubjectLocation())) {
|
|
|
|
|
|
+ if (userExtRecord == null
|
|
|
|
+ && !SubjectLocation.REN_LI_JIA.equals(userSignCertDTO.getSubjectLocation())
|
|
|
|
+ && !SubjectLocation.JIANG_XI.equals(userSignCertDTO.getSubjectLocation())) {
|
|
|
|
+ // 人力家、正启之星-江西 不校验userExtRecord
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
// 查询dept
|
|
// 查询dept
|
|
@@ -774,9 +777,11 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
userInfoModel.setSignImageUrl(StrUtil.isBlank(userSub.getAgreementUrl())
|
|
userInfoModel.setSignImageUrl(StrUtil.isBlank(userSub.getAgreementUrl())
|
|
? null : userSub.getAgreementUrl().startsWith("https")
|
|
? null : userSub.getAgreementUrl().startsWith("https")
|
|
? userSub.getAgreementUrl() : upmsConfig.getClientUrl() + userSub.getAgreementUrl());
|
|
? userSub.getAgreementUrl() : upmsConfig.getClientUrl() + userSub.getAgreementUrl());
|
|
- userInfoModel.setIdCardBackBase64(userExtRecord.getIdCardBackBase64());
|
|
|
|
- userInfoModel.setIdCardFrontBase64(userExtRecord.getIdCardFrontBase64());
|
|
|
|
- userInfoModel.setBestFrameBase64(userExtRecord.getBestFrameBase64());
|
|
|
|
|
|
+ if (userExtRecord != null) {
|
|
|
|
+ userInfoModel.setIdCardBackBase64(userExtRecord.getIdCardBackBase64());
|
|
|
|
+ userInfoModel.setIdCardFrontBase64(userExtRecord.getIdCardFrontBase64());
|
|
|
|
+ userInfoModel.setBestFrameBase64(userExtRecord.getBestFrameBase64());
|
|
|
|
+ }
|
|
|
|
|
|
GigInfoModel infoModel = new GigInfoModel();
|
|
GigInfoModel infoModel = new GigInfoModel();
|
|
infoModel.setBaseInfo(baseInfoModel);
|
|
infoModel.setBaseInfo(baseInfoModel);
|