From 6d731c8647614effe6b08785b8d1e09e4571c9a5 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 9 Jan 2024 23:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E3=80=90userOrg?= =?UTF-8?q?=E3=80=91=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9C=BA=E6=9E=84=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/api/pojo/user/UserOrgDTO.java | 6 ++++++ .../kernel/sys/modular/user/factory/UserOrgFactory.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserOrgDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserOrgDTO.java index 65a4d5415..f1f3d84cd 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserOrgDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserOrgDTO.java @@ -84,4 +84,10 @@ public class UserOrgDTO { @ChineseDescription("是否是主部门：Y-是主部门，N-不是主部门") private String mainFlag; + /** + * 是否启用：1-启用，2-禁用 + */ + @ChineseDescription("是否启用：1-启用，2-禁用") + private Integer statusFlag; + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserOrgFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserOrgFactory.java index 5d132cc3a..d8b69ca0c 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserOrgFactory.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserOrgFactory.java @@ -46,6 +46,9 @@ public class UserOrgFactory { result.setPositionId(positionId); result.setPositionName(positionName); + // 设置用户关联部门的状态 + result.setStatusFlag(sysUserOrg.getStatusFlag()); + return result; }