From 3c6571102c53515d5826582e8c5b3538e08a2f7f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 八月 2024 19:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
index 55c8ab2..bc78481 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
@@ -69,9 +69,10 @@
 
     @ApiOperation(tags = {"小程序-广告管理"},value = "广告列表查询")
     @GetMapping(value = "/list")
-    public AjaxResult<List<TAdvertising>> list() {
+    public AjaxResult<List<TAdvertising>> list(@RequestParam("position") Integer position) {
         return AjaxResult.ok(advertisingService.list(Wrappers.lambdaQuery(TAdvertising.class)
-                .eq(TAdvertising::getStatus, AdvertisingStatusEnum.YES.getCode())));
+                .eq(TAdvertising::getStatus, AdvertisingStatusEnum.YES.getCode())
+                .eq(TAdvertising::getPosition,position)));
     }
 }
 

--
Gitblit v1.7.1