From da6ab95d3a228ce72910e3c5b39eacad4d67ac2c Mon Sep 17 00:00:00 2001 From: chenbowen Date: Fri, 16 Jan 2026 15:17:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/service/oauth2/EbanOAuth2ServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/oauth2/EbanOAuth2ServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/oauth2/EbanOAuth2ServiceImpl.java index 91b2a107..feaa7b81 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/oauth2/EbanOAuth2ServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/oauth2/EbanOAuth2ServiceImpl.java @@ -110,7 +110,7 @@ public class EbanOAuth2ServiceImpl implements EbanOAuth2Service { tokenInfo.getExpiresIn(), userInfo ); - log.info("成功保存E办token，userId={}, uid={}, workcode={}", user.getId(), userInfo.getUid(), workcode); + log.info("成功保存E办token，userId={}, uid={}, workcode={}", user.getId(), userInfo.getUid(), user.getWorkcode()); return createTokenAfterLoginSuccess(user.getId(), user.getUsername(), LoginLogTypeEnum.LOGIN_SOCIAL, ebanAccessTokenDO); From 7c0a0601ed2ac0ad6fabe1ce2ff17621c695dcd0 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Fri, 16 Jan 2026 18:17:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8E=A5=E5=8F=97=E7=A9=BA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=20username=202.=20=E8=B0=83=E6=95=B4=20iwork=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=20loginid=20=E4=B8=BA=E7=A9=BA=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=20username=20=E4=B8=BA=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/integration/iwork/impl/IWorkSyncProcessorImpl.java | 3 +-- .../plat/module/system/service/user/AdminUserServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java index 1c7a8b14..3c92a184 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java @@ -31,7 +31,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.DigestUtils; import java.nio.charset.StandardCharsets; -import java.util.Locale; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -786,7 +785,7 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor { return user.getLoginid().trim(); } // loginid 为空也继续同步，username 设为空字符串，不再回退工号 - return ""; + return " "; } /** diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java index cd4480c4..5f1a6743 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java @@ -190,7 +190,8 @@ public class AdminUserServiceImpl implements AdminUserService { // 2.1 只更新非空字段 AdminUserDO updateObj = new AdminUserDO(); updateObj.setId(updateReqVO.getId()); - if (StrUtil.isNotBlank(updateReqVO.getUsername())) { + // iwork 同步时，存在用户名为空的情况，因此改为 isNotEmpty 判断 + if (StrUtil.isNotEmpty(updateReqVO.getUsername())) { updateObj.setUsername(updateReqVO.getUsername()); } if (StrUtil.isNotBlank(updateReqVO.getNickname())) { From a5f844d5dfd7bb7d70e39c5c03ad698a338267bc Mon Sep 17 00:00:00 2001 From: chenbowen Date: Sat, 17 Jan 2026 10:35:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E4=B8=BA=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E4=B8=80=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0d31b54f1c13c5851ca448f9d55c4b2d4b345458) --- .../system/controller/admin/user/vo/user/UserSaveReqVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index d0bd575d..842ee71c 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -29,7 +29,7 @@ public class UserSaveReqVO { @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "zt") @NotBlank(message = "用户账号不能为空") @Pattern(regexp = "^[a-zA-Z0-9]+$", message = "用户账号由 数字、字母 组成") - @Size(min = 4, max = 30, message = "用户账号长度为 4-30 个字符") + @Size(min = 1, max = 30, message = "用户账号长度为 1-30 个字符") @DiffLogField(name = "用户账号") private String username;