diff --git a/backend-spring/src/main/java/com/erp/controller/SubstituteController.java b/backend-spring/src/main/java/com/erp/controller/SubstituteController.java index e0ef5e32..5f5d8844 100644 --- a/backend-spring/src/main/java/com/erp/controller/SubstituteController.java +++ b/backend-spring/src/main/java/com/erp/controller/SubstituteController.java @@ -53,7 +53,7 @@ public class SubstituteController { @PathVariable("id") Long substituteId, @RequestAttribute("company_code") String companyCode, @RequestAttribute("role") String role) { - if (!"ADMIN".equals(role) && !"SUPER_ADMIN".equals(role)) { + if (!"ADMIN".equals(role) && !"COMPANY_ADMIN".equals(role) && !"SUPER_ADMIN".equals(role)) { return ResponseEntity.status(HttpStatus.FORBIDDEN) .body(ApiResponse.error("관리자만 조회할 수 있습니다.")); } diff --git a/backend-spring/src/main/java/com/erp/service/SubstituteService.java b/backend-spring/src/main/java/com/erp/service/SubstituteService.java index 6e69e81a..91dd408f 100644 --- a/backend-spring/src/main/java/com/erp/service/SubstituteService.java +++ b/backend-spring/src/main/java/com/erp/service/SubstituteService.java @@ -239,7 +239,7 @@ public class SubstituteService extends BaseService { private void requireAdmin(Map params) { String role = (String) params.get("role"); - if (!"ADMIN".equals(role) && !"SUPER_ADMIN".equals(role)) { + if (!"ADMIN".equals(role) && !"COMPANY_ADMIN".equals(role) && !"SUPER_ADMIN".equals(role)) { throw new AccessDeniedException("관리자만 대무자를 지정/수정/해지할 수 있습니다."); } } diff --git a/backend-spring/src/main/resources/mapper/approval.xml b/backend-spring/src/main/resources/mapper/approval.xml index 91005bb9..aad08c1e 100644 --- a/backend-spring/src/main/resources/mapper/approval.xml +++ b/backend-spring/src/main/resources/mapper/approval.xml @@ -222,7 +222,7 @@ AND L.COMPANY_CODE = R.COMPANY_CODE ) - ORDER BY R.CREATED_DATE DESC + ORDER BY R.CREATED_AT DESC LIMIT #{page_limit} OFFSET #{page_offset} @@ -465,7 +465,7 @@ SELECT L.*, R.TITLE, R.TARGET_TABLE, R.TARGET_RECORD_ID, R.REQUESTER_NAME, R.REQUESTER_DEPT, - R.CREATED_DATE AS REQUEST_CREATED_DATE + R.CREATED_AT AS REQUEST_CREATED_DATE FROM APPROVAL_LINES L JOIN APPROVAL_REQUESTS R ON L.REQUEST_ID = R.REQUEST_ID AND L.COMPANY_CODE = R.COMPANY_CODE @@ -475,7 +475,7 @@ AND L.STATUS = 'pending' AND (L.COMPANY_CODE = #{company_code} OR L.COMPANY_CODE = '*') - ORDER BY R.CREATED_DATE ASC + ORDER BY R.CREATED_AT ASC