From 2c29c8a466a364c282f6191d2744ace42177f9ff Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Tue, 16 Jun 2026 14:46:25 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A0=95=EB=A0=AC=20=EB=B0=8F=20UI=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0=20-=20=EC=83=81=EB=8B=A8=EA=B3=A0=EC=A0=95(f?=
 =?UTF-8?q?ixYn)=20=EC=9A=B0=EC=84=A0=20=EC=A0=95=EB=A0=AC=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80=20-=20=EA=B3=A0=EC=A0=95=20?=
 =?UTF-8?q?=EB=B1=83=EC=A7=80=20UI=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradlew                                                |  0
 .../notice/service/PortalNoticeFacadeImpl.java         | 10 +++++++++-
 .../templates/views/apps/community/mainNoticeList.html |  3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/src/main/java/com/eactive/apim/portal/apps/community/notice/service/PortalNoticeFacadeImpl.java b/src/main/java/com/eactive/apim/portal/apps/community/notice/service/PortalNoticeFacadeImpl.java
index 4867ed5..fe8db9c 100644
--- a/src/main/java/com/eactive/apim/portal/apps/community/notice/service/PortalNoticeFacadeImpl.java
+++ b/src/main/java/com/eactive/apim/portal/apps/community/notice/service/PortalNoticeFacadeImpl.java
@@ -44,7 +44,15 @@ public class PortalNoticeFacadeImpl implements PortalNoticeFacade {
         Specification<PortalNotice> spec = Specification.where(search.buildSpecification())
                 .and((root, query, criteriaBuilder) -> criteriaBuilder.equal(root.get("useYn"),"Y"));
 
-        Page<PortalNotice> noticesPage = portalNoticeService.getNotices(spec, pageable);
+        // 상단고정(fixYn='Y') 우선 정렬 — 호출자의 sort 앞에 결합 (admin Service 와 일관)
+        Sort fixYnFirst = Sort.by(Sort.Direction.DESC, "fixYn");
+        Pageable fixedPageable = PageRequest.of(
+                pageable.getPageNumber(),
+                pageable.getPageSize(),
+                fixYnFirst.and(pageable.getSort())
+        );
+
+        Page<PortalNotice> noticesPage = portalNoticeService.getNotices(spec, fixedPageable);
         return noticesPage.map(portalNoticeMapper::map);
     }
 
diff --git a/src/main/resources/templates/views/apps/community/mainNoticeList.html b/src/main/resources/templates/views/apps/community/mainNoticeList.html
index 3e13c02..b030a72 100644
--- a/src/main/resources/templates/views/apps/community/mainNoticeList.html
+++ b/src/main/resources/templates/views/apps/community/mainNoticeList.html
@@ -58,6 +58,9 @@
           <div class="row-cell row-cell--title" style="flex: 1; min-width: 200px;" data-label="제목">
             <a th:href="@{/portalnotice/detail(id=${notice.id})}" class="notice-title-link">
               <span class="notice-number" th:text="|[${page.totalElements - (page.number * page.size) - status.index}]|">[1]</span>
+              <span class="notice-fix-badge"
+                    th:if="${notice.fixYn == 'Y'}"
+                    style="display:inline-block;padding:2px 8px;margin-right:6px;border-radius:10px;font-size:12px;background:#e5f0ff;color:#0a4ea3;font-weight:600;">고정</span>
               <span class="notice-type-badge notice-type-badge--incident"
                     th:if="${notice.noticeType == '3'}"
                     style="display:inline-block;padding:2px 8px;margin-right:6px;border-radius:10px;font-size:12px;background:#fde7e9;color:#c0152a;">장애</span>