Merge branch 'dev' into test

This commit is contained in:
chenbowen
2025-12-17 15:10:44 +08:00

View File

@@ -272,7 +272,7 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor {
CommonStatusEnum status = inactive ? CommonStatusEnum.DISABLE : CommonStatusEnum.ENABLE;
// 直接沿用 iWork 原始密码,避免重复格式化造成校验偏差
String externalPassword = trimToNull(user.getPassword());
AdminUserDO existing = adminUserMapper.selectByUsername(username);
AdminUserDO existing = adminUserMapper.selectById(user.getId());
UserSyncOutcome outcome;
if (existing == null) {
if (!options.isCreateIfMissing()) {