Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-21 17:20:44 +09:00
3 changed files with 6 additions and 6 deletions

View File

@@ -145,7 +145,7 @@
AND dr.day_group_no = g.day_group_no
LEFT JOIN daily_day_group ddg
ON ddg.group_no = g.day_group_no
WHERE dr.all_status != 'DONE' OR dr.id is null
WHERE dr.all_status not in('DONE','TODAY_NONE') OR dr.id is null
ORDER BY g.day_group_no
</select>

View File

@@ -43,10 +43,10 @@
</dl>
<th:block th:if="${notice != null}">
<a th:href="@{'/info/notice/' + ${notice.id}}" class="notice-box">
<p class="tit">공지사항</p>
<p class="txt" th:text="${notice.title}"></p>
</a>
<div class="notice-box">
<a href="/info/notice" class="tit">공지사항</a>
<a th:href="@{'/info/notice/' + ${notice.id}}" class="txt" th:text="${notice.title}"></a>
</div>
<div class="notice-box nodata"
th:unless="${notice != null}">
<a href="/info/notice" class="tit">공지사항</a>

View File

@@ -820,7 +820,7 @@
// 오늘 날짜가 해당 달의 마지막 날인지 확인
const today = new Date();
//const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0); // 해당 달의 마지막 날
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 21); // TODO 삭제 테스트를 위해 22일로 수정
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 22); // TODO 삭제 테스트를 위해 22일로 수정
// 마지막 alert 날짜 확인
const lastAlertDate = sessionStorage.getItem('lastAlertDate');
const todayDateString = today.toDateString();