From a913f8cc4049130014116859a8d67fd0c055a799 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Fri, 30 Jan 2026 12:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=90=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=80=91=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dongjian/dashboard/back/controller/OverviewController.java  | 2 +-
 .../dashboard/back/dao/ex/DashboardNotificationMapperExt.java   | 2 +-
 .../resources/mappers/ex/DashboardNotificationMapperExt.xml     | 1 -
 .../com/dongjian/dashboard/back/service/OverviewService.java    | 2 +-
 .../dashboard/back/service/impl/OverviewServiceImpl.java        | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/OverviewController.java b/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/OverviewController.java
index 86818d4..95dd689 100644
--- a/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/OverviewController.java
+++ b/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/OverviewController.java
@@ -57,7 +57,7 @@ public class OverviewController {
 
 	@Operation(summary = "Get notification")
 	@RequestMapping(value = "/getNotification", method = RequestMethod.GET)
-	public SimpleDataResponse<DashboardNotificationPageVO> getNotification(
+	public SimpleDataResponse<List<DashboardNotificationPageVO>> getNotification(
 			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
 			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
 			@Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId,
diff --git a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardNotificationMapperExt.java b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardNotificationMapperExt.java
index 1a716ca..0a7f069 100644
--- a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardNotificationMapperExt.java
+++ b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardNotificationMapperExt.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DashboardNotificationMapperExt extends DashboardNotificationMapper {
 
-	DashboardNotificationPageVO getNotification(Long companyId);
+	List<DashboardNotificationPageVO> getNotification(Long companyId);
 
 	List<DashboardNotificationPageVO> getListPage(DashboardNotificationSearchParams pageSearchParam);
 
diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardNotificationMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardNotificationMapperExt.xml
index 6e7e574..5125654 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardNotificationMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardNotificationMapperExt.xml
@@ -16,7 +16,6 @@
             dashboard_notification dn LEFT JOIN dashboard_notification_category dnc ON dnc.id = dn.category_id AND dnc.flag = 0
         WHERE dn.flag = 0 AND dn.company_id = #{companyId}
         ORDER BY dn.id DESC
-        LIMIT 1;
     </select>
 
     <select id="getListPage" resultType="com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO">
diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/OverviewService.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/OverviewService.java
index 1257691..43a3a31 100644
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/OverviewService.java
+++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/OverviewService.java
@@ -17,5 +17,5 @@ public interface OverviewService {
 
     SimpleDataResponse<JpMeshHourlyForecasts> getWeatherInfo(QueryWeather queryWeather, Long userId, Long companyId, Integer languageType, Integer utcOffset);
 
-    SimpleDataResponse<DashboardNotificationPageVO> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset);
+    SimpleDataResponse<List<DashboardNotificationPageVO>> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset);
 }
diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java
index d95107e..fd5363d 100644
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java
+++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java
@@ -252,7 +252,7 @@ public class OverviewServiceImpl implements OverviewService {
 	}
 
 	@Override
-	public SimpleDataResponse<DashboardNotificationPageVO> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset) {
+	public SimpleDataResponse<List<DashboardNotificationPageVO>> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset) {
 		return SimpleDataResponse.success(dashboardNotificationMapperExt.getNotification(companyId));
 	}