From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

---
 src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java
index 61e8ab3..a686591 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java
@@ -29,22 +29,27 @@
  **/
 @Slf4j
 @RestController
-@RequestMapping(value = "/api/ad")
+@RequestMapping(value = "/api/cmsAd")
 @Api(value = "CmsAdController", tags = "广告管理接口类")
 public class CmsAdController {
 
     @Autowired
     private ICmsAdInfoService cmsAdInfoService;
 
+    @GetMapping(value = "/getList")
+    public Result getList() {
+        return Result.ok("这是什么");
+    }
+
     @ApiOperation(value = "列表")
     @PostMapping(value = "/list")
     public Result list(@RequestBody @Valid AdListDto adListDto) {
         Page<CmsAdInfoEntity> page = new Page<>(adListDto.getPageNum(), adListDto.getPageSize());
         UserEntity user = LoginUserUtil.getLoginUser();
-        QueryWrapper<CmsAdInfoEntity> query = new QueryWrapper<>();
-        query.eq("company_id", user.getCompanyId());
-
-        return Result.ok("获取成功", cmsAdInfoService.page(page, query));
+        CmsAdInfoEntity cmsAdInfoEntity = new CmsAdInfoEntity();
+        cmsAdInfoEntity.setCompanyId(user.getCompanyId());
+        cmsAdInfoEntity.setName(adListDto.getName());
+        return Result.ok("获取成功", cmsAdInfoService.findInPage(page, cmsAdInfoEntity));
     }
 
     @ApiOperation(value = "根据ID获取信息")

--
Gitblit v1.9.1