合并代码

puzhibing

2024-08-19 48c9592f2dfa35c91c0204e307b21e9f8d104507

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java

@@ -35,15 +35,27 @@
    }

    @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "删除")
    @PostMapping(value = "/deleteById/{id}")
    public AjaxResult deleteById(@PathVariable Integer id) {
        noticeService.removeById(id);
    @DeleteMapping(value = "/deleteById")
    public AjaxResult deleteById(String ids) {
        String[] split = ids.split(",");
        for (String id : split) {
            noticeService.removeById(id);
        }

        return AjaxResult.success();
    }

    @ApiOperation(tags = {"后台-内容设置-公告管理"},value = "查询")
    @PostMapping(value = "/pageList")
    public AjaxResult<Page<TNotice>> authPageList(@RequestBody NoticeQueryDto query) {
        if (query.getStatus()==null){

                return AjaxResult.success(noticeService.lambdaQuery()
                        .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
                        .page(Page.of(query.getPageCurr(),query.getPageSize())));

        }

            if (query.getStatus()==0){
                return AjaxResult.success(noticeService.lambdaQuery()
                        .le(TNotice::getStartTime, LocalDateTime.now())
@@ -59,12 +71,8 @@
                        .ge(TNotice::getEndTime, LocalDateTime.now())
                        .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
                        .page(Page.of(query.getPageCurr(),query.getPageSize())));
            }else{
                return AjaxResult.success(noticeService.lambdaQuery()
                        .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
                        .page(Page.of(query.getPageCurr(),query.getPageSize())));
        }

            }
        return AjaxResult.success();

    }