From b999b74b81f5a344835e6be6690ae0328a6158aa Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 11 十二月 2024 17:07:56 +0800
Subject: [PATCH] 1.后台管理-商品管理

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 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 4f31a82..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
@@ -8,7 +8,6 @@
 import com.ruoyi.other.service.BannerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -24,16 +23,16 @@
  */
 @RestController
 @RequestMapping("/banner")
-@Api("轮播图")
+@Api(tags = "轮播图")
 public class BannerController {
     @Resource
     private BannerService bannerService;
-    @PostMapping("/index/list")
-	@ApiOperation(value = "banner列表", tags = {"小程序-首页"})
+    @GetMapping("/list")
+	@ApiOperation(value = "banner列表", tags = {"小程序-banner"})
 	public R<List<Banner>> list(String name, Integer jumpType, Integer position){
         List<Banner> list = 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)
                 .list();
         return R.ok(list);
     }
@@ -43,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);
@@ -55,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