diff --git a/src/main/java/com/goi/erp/auditing/ApplicationAuditAware.java b/src/main/java/com/goi/erp/auditing/ApplicationAuditAware.java index 08b167c..77ef30d 100644 --- a/src/main/java/com/goi/erp/auditing/ApplicationAuditAware.java +++ b/src/main/java/com/goi/erp/auditing/ApplicationAuditAware.java @@ -9,10 +9,10 @@ import com.goi.erp.employee.EmployeeDetails; import java.util.Optional; -public class ApplicationAuditAware implements AuditorAware { +public class ApplicationAuditAware implements AuditorAware { @Override - public Optional getCurrentAuditor() { + public Optional getCurrentAuditor() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null || diff --git a/src/main/java/com/goi/erp/config/ApplicationConfig.java b/src/main/java/com/goi/erp/config/ApplicationConfig.java index f2fdbb3..f353ac0 100644 --- a/src/main/java/com/goi/erp/config/ApplicationConfig.java +++ b/src/main/java/com/goi/erp/config/ApplicationConfig.java @@ -53,7 +53,7 @@ public class ApplicationConfig { } @Bean - public AuditorAware auditorAware() { + public AuditorAware auditorAware() { return new ApplicationAuditAware(); } diff --git a/src/main/java/com/goi/erp/employee/Employee.java b/src/main/java/com/goi/erp/employee/Employee.java index e4bb169..7c1d739 100644 --- a/src/main/java/com/goi/erp/employee/Employee.java +++ b/src/main/java/com/goi/erp/employee/Employee.java @@ -23,7 +23,7 @@ public class Employee { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "emp_id") - private Integer empId; // 내부 PK, 외부 노출 X + private Long empId; // 내부 PK, 외부 노출 X @Column(name = "emp_uuid", unique = true, nullable = false) private UUID empUuid; // 외부 키로 사용 @@ -41,7 +41,7 @@ public class Employee { private String empLastName; @Column(name = "emp_dept_id") - private Integer empDeptId; + private Long empDeptId; @Column(name = "emp_status", columnDefinition = "CHAR(1)") private String empStatus; diff --git a/src/main/java/com/goi/erp/employee/EmployeeRole.java b/src/main/java/com/goi/erp/employee/EmployeeRole.java index 6f43600..9af12ce 100644 --- a/src/main/java/com/goi/erp/employee/EmployeeRole.java +++ b/src/main/java/com/goi/erp/employee/EmployeeRole.java @@ -30,7 +30,7 @@ public class EmployeeRole { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "emr_id") - private Integer emrId; // 내부 PK + private Long emrId; // 내부 PK @Column(name = "emr_uuid", unique = true, nullable = false) private UUID emrUuid; // 외부용 UUID diff --git a/src/main/java/com/goi/erp/employee/EmployeeRoleRepository.java b/src/main/java/com/goi/erp/employee/EmployeeRoleRepository.java index 5bf3d3c..573f498 100644 --- a/src/main/java/com/goi/erp/employee/EmployeeRoleRepository.java +++ b/src/main/java/com/goi/erp/employee/EmployeeRoleRepository.java @@ -15,5 +15,5 @@ public interface EmployeeRoleRepository extends JpaRepository findActiveRolesByEmployeeId(Integer empId); + List findActiveRolesByEmployeeId(Long empId); } \ No newline at end of file diff --git a/src/main/java/com/goi/erp/permission/PermissionInfo.java b/src/main/java/com/goi/erp/permission/PermissionInfo.java index 0b9e865..546bb91 100644 --- a/src/main/java/com/goi/erp/permission/PermissionInfo.java +++ b/src/main/java/com/goi/erp/permission/PermissionInfo.java @@ -26,7 +26,7 @@ public class PermissionInfo { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "perm_id") - private Integer permId; + private Long permId; @Column(name = "perm_uuid", nullable = false, updatable = false) private UUID permUuid; diff --git a/src/main/java/com/goi/erp/role/RoleInfo.java b/src/main/java/com/goi/erp/role/RoleInfo.java index 786400b..b4680fb 100644 --- a/src/main/java/com/goi/erp/role/RoleInfo.java +++ b/src/main/java/com/goi/erp/role/RoleInfo.java @@ -28,7 +28,7 @@ public class RoleInfo { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "role_id") - private Integer roleId; + private Long roleId; @Column(name = "role_uuid", unique = true, nullable = false) private UUID roleUuid; diff --git a/src/main/java/com/goi/erp/role/RolePermission.java b/src/main/java/com/goi/erp/role/RolePermission.java index 14d5b0e..acce332 100644 --- a/src/main/java/com/goi/erp/role/RolePermission.java +++ b/src/main/java/com/goi/erp/role/RolePermission.java @@ -27,7 +27,7 @@ public class RolePermission { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "rpr_id") - private Integer id; + private Long id; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "rpr_role_id", nullable = false) diff --git a/src/main/java/com/goi/erp/role/RolePermissionRepository.java b/src/main/java/com/goi/erp/role/RolePermissionRepository.java index cd00556..6754fc4 100644 --- a/src/main/java/com/goi/erp/role/RolePermissionRepository.java +++ b/src/main/java/com/goi/erp/role/RolePermissionRepository.java @@ -12,7 +12,7 @@ public interface RolePermissionRepository extends JpaRepository findByRoleId(@Param("roleId") Integer roleId); + List findByRoleId(@Param("roleId") Long roleId); // Role과 Permission 매핑 존재 여부 확인 @Query(""" @@ -21,6 +21,6 @@ public interface RolePermissionRepository extends JpaRepository { where t.employee.id = :employeeId and (t.expired = false or t.revoked = false) """) - List findAllValidTokenByEmployee(Integer employeeId); + List findAllValidTokenByEmployee(Long employeeId); Optional findByToken(String token);