diff --git a/backend/src/main/java/com/srsystem/entity/Employee.java b/backend/src/main/java/com/srsystem/entity/Employee.java index 69336d4..c3c276d 100644 --- a/backend/src/main/java/com/srsystem/entity/Employee.java +++ b/backend/src/main/java/com/srsystem/entity/Employee.java @@ -44,17 +44,20 @@ public class Employee extends BaseEntity { @Column(name = "phone", length = 20) private String phone; + @Builder.Default @Enumerated(EnumType.STRING) @Column(name = "role_code", nullable = false, length = 20) - private RoleCode roleCode; + private RoleCode roleCode = RoleCode.EMPLOYEE; + @Builder.Default @Enumerated(EnumType.STRING) @Column(name = "emp_status", nullable = false, length = 20) - private EmpStatus empStatus; + private EmpStatus empStatus = EmpStatus.ACTIVE; + @Builder.Default @Enumerated(EnumType.STRING) @Column(name = "dispatch_status", nullable = false, length = 20) - private DispatchStatus dispatchStatus; + private DispatchStatus dispatchStatus = DispatchStatus.WAITING; @Column(name = "joined_date") private LocalDate joinedDate; diff --git a/backend/src/main/java/com/srsystem/service/EmployeeService.java b/backend/src/main/java/com/srsystem/service/EmployeeService.java index caa9c0a..c578a6c 100644 --- a/backend/src/main/java/com/srsystem/service/EmployeeService.java +++ b/backend/src/main/java/com/srsystem/service/EmployeeService.java @@ -80,6 +80,10 @@ public class EmployeeService { throw new BusinessException(ErrorCode.DUPLICATE_LOGIN_ID); } + if (employee.getRoleCode() == null) employee.setRoleCode(RoleCode.EMPLOYEE); + if (employee.getEmpStatus() == null) employee.setEmpStatus(EmpStatus.ACTIVE); + if (employee.getDispatchStatus() == null) employee.setDispatchStatus(DispatchStatus.WAITING); + employee.setPassword(passwordEncoder.encode(employee.getPassword())); return employeeRepository.save(employee); }