From cc134fa83edea4865b48d7afc1acda5ad70e7465 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:20:05 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
index 5edc8ff..1cf964f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
@@ -69,13 +69,10 @@
RedPackegeSet redPackegeSet = redPackegeSetList.get(i);
LocalDateTime startTime = redPackegeSet.getStartTime();
LocalDateTime endTime = redPackegeSet.getEndTime();
- for (int j = 0; j < redPackegeSetList.size(); j++) {
- RedPackegeSet redPackegeSet1 = redPackegeSetList.get(j);
+ for (RedPackegeSet redPackegeSet1 : redPackegeSetList) {
LocalDateTime startTime1 = redPackegeSet1.getStartTime();
LocalDateTime endTime1 = redPackegeSet1.getEndTime();
- if(i != j && ((startTime.isAfter(startTime1) && endTime.isBefore(endTime1))
- || (startTime.isBefore(startTime1) && endTime.isAfter(startTime1) && endTime.isBefore(endTime1))
- || (startTime.isAfter(startTime1) && startTime.isBefore(endTime1) && endTime.isAfter(endTime1)))){
+ if (!(endTime.isBefore(startTime1) || startTime.isAfter(endTime1))) {
return R.fail("时间有重叠，请重新配置");
}
}
--
Gitblit v1.7.1