From aba200e53f5be7928b49d6c267a8b73711f585d0 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 24 Oct 2024 10:22:17 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-24=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BomManagementServiceImpl.java    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
index 726c8389..998065bd 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
@@ -620,28 +620,33 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 Date existingEffPhaseInDate = existingBomHeader.getEffPhaseInDate();
                 Date existingEffPhaseOutDate = existingBomHeader.getEffPhaseOutDate();
 
+                // 检查日期是否为null
+                if (newEffPhaseInDate == null || newEffPhaseOutDate == null || existingEffPhaseInDate == null || existingEffPhaseOutDate == null) {
+                    continue; // 跳过此次循环迭代
+                }
+
                 // 如果新对象的开始时间在现有对象的时间范围内，则重叠
-                if (newEffPhaseInDate != null && newEffPhaseInDate.after(existingEffPhaseInDate) && newEffPhaseInDate.before(existingEffPhaseOutDate)) {
+                if (newEffPhaseInDate.after(existingEffPhaseInDate) && newEffPhaseInDate.before(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果新对象的结束时间在现有对象的时间范围内，则重叠
-                else if (newEffPhaseOutDate != null && newEffPhaseOutDate.after(existingEffPhaseInDate) && newEffPhaseOutDate.before(existingEffPhaseOutDate)) {
+                else if (newEffPhaseOutDate.after(existingEffPhaseInDate) && newEffPhaseOutDate.before(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果现有对象的开始时间在新对象的时间范围内，则重叠
-                else if (existingEffPhaseInDate != null && existingEffPhaseInDate.after(newEffPhaseInDate) && existingEffPhaseInDate.before(newEffPhaseOutDate)) {
+                else if (existingEffPhaseInDate.after(newEffPhaseInDate) && existingEffPhaseInDate.before(newEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果现有对象的结束时间在新对象的时间范围内，则重叠
-                else if (existingEffPhaseOutDate != null && existingEffPhaseOutDate.after(newEffPhaseInDate) && existingEffPhaseOutDate.before(newEffPhaseOutDate)) {
+                else if (existingEffPhaseOutDate.after(newEffPhaseInDate) && existingEffPhaseOutDate.before(newEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果两个时间段完全相同，则重叠
-                else if (newEffPhaseInDate != null && newEffPhaseInDate.equals(existingEffPhaseInDate) && newEffPhaseOutDate.equals(existingEffPhaseOutDate)) {
+                else if (newEffPhaseInDate.equals(existingEffPhaseInDate) && newEffPhaseOutDate.equals(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }