From e2dbaf12a4858bd70d5fc7e1c2f3a0d9668536ae Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 25 Nov 2025 16:05:52 +0800 Subject: [PATCH] =?UTF-8?q?iwork=20=E4=BA=BA=E5=91=98=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/system/enums/dept/DeptSourceEnum.java | 3 ++- .../com/zt/plat/module/system/enums/user/UserSourceEnum.java | 3 ++- .../plat/module/system/service/auth/AdminAuthServiceImpl.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/dept/DeptSourceEnum.java b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/dept/DeptSourceEnum.java index 9933f0b3..805d56d9 100644 --- a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/dept/DeptSourceEnum.java +++ b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/dept/DeptSourceEnum.java @@ -13,7 +13,8 @@ import lombok.Getter; public enum DeptSourceEnum { EXTERNAL(1, "外部部门"), // 系统创建的部门 - SYNC(2, "同步部门"); // 通过 OrgSyncService 同步的部门 + SYNC(2, "同步部门"), // 通过 OrgSyncService 同步的部门 + IWORK(3, "iWork 同步"); // 通过 iWork 同步的部门 /** * 类型 diff --git a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/user/UserSourceEnum.java b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/user/UserSourceEnum.java index 20c8b9f0..2299cd0d 100644 --- a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/user/UserSourceEnum.java +++ b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/user/UserSourceEnum.java @@ -13,7 +13,8 @@ import lombok.Getter; public enum UserSourceEnum { EXTERNAL(1, "外部用户"), // 系统创建、注册等方式产生的用户 - SYNC(2, "同步用户"); // 通过 UserSyncService 同步的用户 + SYNC(2, "同步用户"), // 通过 UserSyncService 同步的用户 + IWORK(3, "iWork 用户"); // 通过 iWork 全量/单条同步产生的用户 /** * 类型 diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java index 6b6246fb..6983360b 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java @@ -444,7 +444,9 @@ public class AdminAuthServiceImpl implements AdminAuthService { Integer userSource = user.getUserSource(); // 同步用户(SYNC = 2)为内部用户，需要使用E办登录 - if (userSource != null && userSource.equals(UserSourceEnum.SYNC.getSource())) { + if (userSource != null && + (userSource.equals(UserSourceEnum.SYNC.getSource()) || + userSource.equals(UserSourceEnum.IWORK.getSource()))) { return true; }