From 72f1897ad39638eee7a22b28477b28e99accfc7f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 15:16:54 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
index 21573c3..5b86545 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -42,7 +42,7 @@
bannerService.save(banner);
return R.ok();
}
- @PostMapping("/delete")
+ @GetMapping("/delete")
@ApiOperation(value = "删除", tags = {"后台-广告管理-banner管理"})
public R delete(@RequestParam Integer id){
bannerService.removeById(id);
@@ -54,18 +54,18 @@
bannerService.updateById(banner);
return R.ok();
}
- @PostMapping("/detail")
+ @GetMapping("/detail")
@ApiOperation(value = "详情", tags = {"后台-广告管理-banner管理"})
public R detail(@RequestParam Integer id){
Banner byId = bannerService.getById(id);
return R.ok(byId);
}
- @PostMapping("/page/list")
+ @GetMapping("/page/list")
@ApiOperation(value = "列表", tags = {"后台-广告管理--banner"})
public R<Page<Banner>> pagelist(String name, Integer jumpType, Integer position,Integer pageNum,Integer pageSize){
Page<Banner> page = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name)
- .eq(Banner::getJumpType, jumpType)
- .eq(Banner::getPosition, position)
+ .eq(jumpType!=null,Banner::getJumpType, jumpType)
+ .eq(position!=null,Banner::getPosition, position)
.page(Page.of(pageNum, pageSize));
return R.ok(page);
}
--
Gitblit v1.7.1