Skip to content

Commit 10b04ec

Browse files
authored
[EC-238] fix: 유고결석 부분 수정` (#248)
1 parent 2ebdb02 commit 10b04ec

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

api/src/main/java/org/example/educheck/domain/absenceattendance/service/AbsenceAttendanceService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ private static void validateModifiable(AbsenceAttendance absenceAttendance) {
6969
}
7070

7171
private static void validateAttendanceAbsenceCancellable(AbsenceAttendance absenceAttendance) {
72-
if (absenceAttendance.getIsApprove().equals('T') || absenceAttendance.getIsApprove().equals('F')) {
72+
73+
Character isApprove = absenceAttendance.getIsApprove();
74+
75+
if (isApprove != null && (isApprove.equals('T') || isApprove.equals('F'))) {
7376
throw new InvalidRequestException("처리된 신청 내역은 취소할 수 없습니다.");
7477
}
7578
}

client/src/components/listItem/leftLineListItem/LeftLineListItem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import MoreButton from '../../buttons/moreButton/MoreButton';
55

66

77
export default function LeftLineListItem({
8-
isClickable,
8+
isClickable = false,
99
handleClick,
1010
status,
1111
children,

client/src/pages/studentAttendanceAbsence/StudentAttendanceAbsence.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export default function StudentAttendanceAbsence() {
331331
return (
332332
<LeftLineListItem
333333
key={index}
334-
isClickable={true}
334+
isClickable={false}
335335
status={statusText}
336336
children={modifiedItem}
337337
handleClick ={() => handleTagChange(item)}

0 commit comments

Comments
 (0)