首页【通知】支持显示多个

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,

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);
 

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">

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);
 }

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));
 	}