Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道#636、#670问题修复

Browse Source
This commit is contained in:
gaoqr
2024-11-25 16:09:43 +08:00
parent 8f695c765b
commit dfb2a0cccf
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java
+11
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.system.controller.admin.notice; package com.cf.imes.module.system.controller.admin.notice;
import cn.hutool.core.lang.Assert; 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.enums.UserTypeEnum;
import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.PageResult;
@@ -62,11 +63,21 @@ public class NoticeController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获取通知公告列表") @Operation(summary = "获取通知公告列表")
@PreAuthorize("@ss.hasPermission('system:notice:query')")
public CommonResult<PageResult<NoticeRespVO>> getNoticePage(@Validated NoticePageReqVO pageReqVO) { public CommonResult<PageResult<NoticeRespVO>> getNoticePage(@Validated NoticePageReqVO pageReqVO) {
PageResult<NoticeDO> pageResult = noticeService.getNoticePage(pageReqVO); PageResult<NoticeDO> pageResult = noticeService.getNoticePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, NoticeRespVO.class)); return success(BeanUtils.toBean(pageResult, NoticeRespVO.class));
} }
@GetMapping("/homepage")
@Operation(summary = "获取首页通知公告列表")
public CommonResult<PageResult<NoticeRespVO>> getHomePageNoticePage(@Validated NoticePageReqVO pageReqVO) {
// 首页只看生效的公告
pageReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
PageResult<NoticeDO> pageResult = noticeService.getNoticePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, NoticeRespVO.class));
}
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得通知公告") @Operation(summary = "获得通知公告")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java
+1 -1
View File
@@ -36,7 +36,7 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
.eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) .eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
.betweenIfPresent(RoleDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(RoleDO::getCreateTime, reqVO.getCreateTime())
.ne(RoleDO::getId, 1) .ne(RoleDO::getId, 1)
.orderByAsc(RoleDO::getId); .orderByAsc(RoleDO::getSort).orderByAsc(RoleDO::getId);
return selectPage(reqVO, lambdaQueryWrapperX); return selectPage(reqVO, lambdaQueryWrapperX);
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/notice/NoticeServiceImpl.java
-5
View File
@@ -54,11 +54,6 @@ public class NoticeServiceImpl implements NoticeService {
@Override @Override
public PageResult<NoticeDO> getNoticePage(NoticePageReqVO reqVO) { public PageResult<NoticeDO> getNoticePage(NoticePageReqVO reqVO) {
// 没有显示传入状态默认查有效的
Integer status = reqVO.getStatus();
if (ObjectUtil.isNull(status)) {
reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
}
return noticeMapper.selectPage(reqVO); return noticeMapper.selectPage(reqVO);
} }