From dfb2a0cccffe9fdb078265608d2cc8fb43ae2157 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 25 Nov 2024 16:08:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93#636=E3=80=81#670=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/notice/NoticeController.java | 11 +++++++++++ .../system/dal/mysql/permission/RoleMapper.java | 2 +- .../system/service/notice/NoticeServiceImpl.java | 5 ----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java index c04ed748b..bee49431a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.controller.admin.notice; import cn.hutool.core.lang.Assert; +import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.enums.UserTypeEnum; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; @@ -62,11 +63,21 @@ public class NoticeController { @GetMapping("/page") @Operation(summary = "获取通知公告列表") + @PreAuthorize("@ss.hasPermission('system:notice:query')") public CommonResult> getNoticePage(@Validated NoticePageReqVO pageReqVO) { PageResult pageResult = noticeService.getNoticePage(pageReqVO); return success(BeanUtils.toBean(pageResult, NoticeRespVO.class)); } + @GetMapping("/homepage") + @Operation(summary = "获取首页通知公告列表") + public CommonResult> getHomePageNoticePage(@Validated NoticePageReqVO pageReqVO) { + // 首页只看生效的公告 + pageReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + PageResult pageResult = noticeService.getNoticePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, NoticeRespVO.class)); + } + @GetMapping("/get") @Operation(summary = "获得通知公告") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java index 3e7a757c4..05f467a8b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java @@ -36,7 +36,7 @@ public interface RoleMapper extends BaseMapperX { .eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) .betweenIfPresent(RoleDO::getCreateTime, reqVO.getCreateTime()) .ne(RoleDO::getId, 1) - .orderByAsc(RoleDO::getId); + .orderByAsc(RoleDO::getSort).orderByAsc(RoleDO::getId); return selectPage(reqVO, lambdaQueryWrapperX); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notice/NoticeServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notice/NoticeServiceImpl.java index 0828dbe4d..c8c249efb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notice/NoticeServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notice/NoticeServiceImpl.java @@ -54,11 +54,6 @@ public class NoticeServiceImpl implements NoticeService { @Override public PageResult getNoticePage(NoticePageReqVO reqVO) { - // 没有显示传入状态默认查有效的 - Integer status = reqVO.getStatus(); - if (ObjectUtil.isNull(status)) { - reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); - } return noticeMapper.selectPage(reqVO); }