From 0c33349d85e1a3d6fdc600477769e334460a2ccb Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 9 Jan 2024 22:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E3=80=90userOrg?=
 =?UTF-8?q?=E3=80=91=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=EF=BC=8C=E4=B8=BB=E9=83=A8=E9=97=A8=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=A2=AB=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modular/user/enums/SysUserOrgExceptionEnum.java    | 7 ++++++-
 .../modular/user/service/impl/SysUserOrgServiceImpl.java   | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/enums/SysUserOrgExceptionEnum.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/enums/SysUserOrgExceptionEnum.java
index 3b780e4d6..bf37fc609 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/enums/SysUserOrgExceptionEnum.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/enums/SysUserOrgExceptionEnum.java
@@ -31,7 +31,12 @@ public enum SysUserOrgExceptionEnum implements AbstractExceptionEnum {
     /**
      * 用户主部门数量错误，用户存在多个主部门信息，请纠正数据错误
      */
-    MAIN_FLAG_COUNT_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10004", "用户主部门数量错误，用户存在多个主部门信息，请纠正数据错误，用户id为：{}");
+    MAIN_FLAG_COUNT_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10004", "用户主部门数量错误，用户存在多个主部门信息，请纠正数据错误，用户id为：{}"),
+
+    /**
+     * 用户所属主部门不能被禁用
+     */
+    MAIN_FLAG_DISABLE_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10005", "用户所属主部门不能被禁用，请修改状态");
 
     /**
      * 错误编码
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
index b60336222..a57cbf2e8 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
@@ -318,6 +318,11 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
                 throw new ServiceException(SysUserOrgExceptionEnum.EMPTY_PARAM);
             }
 
+            // 主部门不能禁用
+            if (YesOrNotEnum.Y.getCode().equals(sysUserOrg.getMainFlag()) && !StatusEnum.ENABLE.getCode().equals(sysUserOrg.getStatusFlag())) {
+                throw new ServiceException(SysUserOrgExceptionEnum.MAIN_FLAG_DISABLE_ERROR);
+            }
+
             // 统计主部门的数量
             if (YesOrNotEnum.Y.getCode().equals(sysUserOrg.getMainFlag())) {
                 mainFlagCount++;