From 565547a1d026a9bcff26f3e0edaf079bdb7a55d4 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 08:55:52 +0800
Subject: [PATCH] 10.26
---
cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
index a317cf5..1fd14f0 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
@@ -84,15 +84,18 @@
try {
List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
- List<BannerVo> list2 = bannerService.list1(position);
+ if (position == 4) {
+ List<BannerVo> list2 = bannerService.list1(position);
+ return ResultUtil.success(list2);
+ }
-// List<BannerVo> list1 = new ArrayList<>();
-// for (Banner banner : list2) {
-// BannerVo bannerVo = new BannerVo();
-// BeanUtils.copyProperties(banner, bannerVo);
-// list1.add(bannerVo);
-// }
- return ResultUtil.success(list2);
+ List<BannerVo> list1 = new ArrayList<>();
+ for (Banner banner : list) {
+ BannerVo bannerVo = new BannerVo();
+ BeanUtils.copyProperties(banner, bannerVo);
+ list1.add(bannerVo);
+ }
+ return ResultUtil.success(list1);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1