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 getNotification( + public SimpleDataResponse> 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 getNotification(Long companyId); List 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;