From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
index 96a8c09..87bffd1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
@@ -7,7 +7,10 @@
import cc.mrbird.febs.mall.dto.MallNewsInfoDto;
import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.service.IMallNewsCategoryService;
import cc.mrbird.febs.mall.service.IMallNewsInfoService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -31,6 +34,7 @@
public class AdminNewsInfoController extends BaseController {
private final IMallNewsInfoService mallNewsInfoService;
+ private final IMallNewsCategoryService mallNewsCategoryService;
/**
* 新闻中心-列表
@@ -95,8 +99,12 @@
}
@GetMapping(value = "findAllCategoryList")
- public FebsResponse findAllCategoryList() {
- List<MallNewsCategory> categories = mallNewsInfoService.findAllCategory();
+ public FebsResponse findAllCategoryList(String code) {
+ LambdaQueryWrapper<MallNewsCategory> query = new LambdaQueryWrapper<>();
+ if (StrUtil.isNotBlank(code)) {
+ query.eq(MallNewsCategory::getCode, code);
+ }
+ List<MallNewsCategory> categories = mallNewsCategoryService.list(query);
return new FebsResponse().success().data(categories);
}
--
Gitblit v1.9.1