From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 18 十月 2024 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java | 9 +++++++--
1 files changed, 7 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 984eab7..e7112fb 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
@@ -25,6 +25,9 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -65,7 +68,7 @@
@ApiOperation(tags = {"管理后台-广告管理"},value = "广告修改")
@Log(title = "【广告管理】修改广告", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
public AjaxResult updateVip(@RequestBody TAdvertising dto) {
- if (dto.getJumpType() == 2){
+ if (dto.getJumpType()!=null && dto.getJumpType() == 2){
// 清空跳转地址
advertisingService.updateById(dto);
LambdaUpdateWrapper<TAdvertising> tAdvertisingLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
@@ -96,7 +99,9 @@
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::getPosition,position)));
+ .eq(TAdvertising::getPosition,position)
+ .le(TAdvertising::getStartTime, LocalDateTime.now())
+ .ge(TAdvertising::getEndTime,LocalDateTime.now())));
}
}
--
Gitblit v1.7.1