From d183b376d8a5f61c1333517c07c8438956d5f09b Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 11 Jul 2025 09:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5=E6=97=B6=E6=80=A7=E5=88=AB?=
 =?UTF-8?q?,=E4=BF=AE=E6=94=B9=E4=BA=86=E5=89=8D=E5=8F=B0=E7=9A=84?=
 =?UTF-8?q?=E5=87=BA=E9=99=A2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/employee/domain/form/EmployeeAddForm.java       | 2 +-
 .../module/system/employee/service/EmployeeService.java    | 3 +++
 .../sa/common/common/enumeration/DischargeStatusEnum.java  | 7 ++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
index 09bf252..7100767 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
@@ -36,7 +36,7 @@ public class EmployeeAddForm {
 
     @ApiModelPropertyEnum(GenderEnum.class)
     @CheckEnum(value = GenderEnum.class, message = "性别错误")
-    private Integer gender;
+    private String gender;
 
     @ApiModelProperty("部门id")
     @NotNull(message = "部门id不能为空")
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
index 542c4d7..80011d7 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
@@ -136,6 +136,9 @@ public class EmployeeService {
         // 设置密码 默认密码
         String password = randomPassword();
         entity.setLoginPwd(getEncryptPwd(password));
+        if (employeeAddForm.getGender() != null) {
+            entity.setGender(Integer.valueOf(employeeAddForm.getGender()));
+        }
 
         // 保存数据
         entity.setDeletedFlag(Boolean.FALSE);
diff --git a/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java b/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java
index a6ac116..480d020 100644
--- a/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java
+++ b/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java
@@ -34,7 +34,12 @@ public enum DischargeStatusEnum implements BaseEnum {
     /**
      * 4 死亡
      */
-    D("4", "死亡");
+    D("4", "死亡"),
+
+    /**
+     * 5 移植
+     */
+    E("5", "移植");
 
     private final String value;