diff --git a/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/processor/AbstractIdentitySourcePostProcessor.java b/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/processor/AbstractIdentitySourcePostProcessor.java index 51b7d058..13718b19 100644 --- a/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/processor/AbstractIdentitySourcePostProcessor.java +++ b/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/processor/AbstractIdentitySourcePostProcessor.java @@ -37,10 +37,7 @@ import cn.topiam.employee.common.entity.account.UserEntity; import cn.topiam.employee.common.entity.account.po.UserPO; import cn.topiam.employee.common.entity.identitysource.IdentitySourceEntity; import cn.topiam.employee.common.entity.identitysource.config.StrategyConfig; -import cn.topiam.employee.common.enums.MailType; -import cn.topiam.employee.common.enums.SyncStatus; -import cn.topiam.employee.common.enums.UserStatus; -import cn.topiam.employee.common.enums.ViewContentType; +import cn.topiam.employee.common.enums.*; import cn.topiam.employee.common.enums.identitysource.IdentitySourceActionType; import cn.topiam.employee.common.enums.identitysource.IdentitySourceProvider; import cn.topiam.employee.common.repository.identitysource.IdentitySourceRepository; @@ -63,8 +60,7 @@ import lombok.extern.slf4j.Slf4j; import jakarta.persistence.EntityManager; import static cn.topiam.employee.common.enums.UserStatus.DISABLED; import static cn.topiam.employee.common.enums.UserStatus.ENABLED; -import static cn.topiam.employee.common.enums.identitysource.IdentitySourceProvider.DINGTALK; -import static cn.topiam.employee.common.enums.identitysource.IdentitySourceProvider.FEISHU; +import static cn.topiam.employee.common.enums.identitysource.IdentitySourceProvider.*; import static cn.topiam.employee.support.constant.EiamConstants.SYSTEM_DEFAULT_USER_NAME; /** @@ -124,9 +120,15 @@ public class AbstractIdentitySourcePostProcessor { enabled = Boolean.TRUE.equals(strategyConfig.getEnabled()); } entity.setStatus(enabled || user.getActive() ? ENABLED : DISABLED); - entity.setPhone(StringUtils.isEmpty(user.getPhone()) ? null : user.getPhone()); - entity.setPhoneAreaCode(user.getPhoneAreaCode()); - entity.setEmail(StringUtils.isEmpty(user.getEmail()) ? null : user.getEmail()); + if (StringUtils.isNotBlank(user.getEmail())){ + entity.setEmail(user.getEmail()); + entity.setEmailVerified(true); + } + if (StringUtils.isNotBlank(user.getPhone())){ + entity.setPhone(user.getPhone()); + entity.setPhoneVerified(true); + entity.setPhoneAreaCode(user.getPhoneAreaCode()); + } entity.setNickName(user.getUserDetail().getNickName()); entity.setFullName(user.getUserDetail().getName()); entity.setIdentitySourceId(identitySource.getId()); @@ -165,12 +167,18 @@ public class AbstractIdentitySourcePostProcessor { log.error("创建用户, 同步头像发生异常: 用户: [{}], 异常: [{}]", user.getUserId(), e.getMessage()); } } - entity.setEmail(StringUtils.isEmpty(user.getEmail()) ? null : user.getEmail()); - entity.setPhone(StringUtils.isEmpty(user.getPhone()) ? null : user.getPhone()); + if (StringUtils.isNotBlank(user.getPhone())){ + entity.setPhone(user.getPhone()); + entity.setPhoneVerified(true); + entity.setPhoneAreaCode(user.getPhoneAreaCode()); + } + if (StringUtils.isNotBlank(user.getEmail())){ + entity.setEmail(user.getEmail()); + entity.setEmailVerified(true); + } entity.setFullName(user.getUserDetail().getName()); entity.setNickName(user.getUserDetail().getNickName()); entity.setExpireDate(LocalDate.of(2116,12,31)); - entity.setPhoneAreaCode(user.getPhoneAreaCode()); //配置为启用,上游未启用,用户为禁用 entity.setStatus(enabled || user.getActive() ? ENABLED : DISABLED); entity.setUsername(user.getUserId());