From e6ec4f9e23ecef9eee420f6bbc928e009cb12e0d Mon Sep 17 00:00:00 2001 From: chenbowen Date: Fri, 16 Jan 2026 18:17:24 +0800 Subject: [PATCH] =?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())) {