From d831ca2ffb92dfc53c6c140028fcea31c1e0a22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Mon, 1 Jun 2026 09:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=B4=BE=E8=A7=84=E7=A8=8B=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=96=B0=E5=A2=9E=E7=9A=84=E6=97=B6=E5=80=99=E9=9D=A2?=
 =?UTF-8?q?=E7=A7=AF=E4=B8=8D=E5=A1=AB=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BsAssignServiceImpl.java      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java
index 8b48cb708..a1d271362 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java
@@ -53,10 +53,7 @@ import org.springblade.system.cache.DictCache;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -129,12 +126,17 @@ public class BsAssignServiceImpl extends BaseServiceImpl<BsAssignMapper, BsAssig
 
 		for (BsAssignEntity entity : entities) {
 			// 单面积区间
-			if (entity.getUpArea().compareTo(entity.getLowArea()) < 0) {
-				R.fail("单面积上限不能小于单面积下限") ;
+			if (Objects.nonNull(entity.getLowArea()) && Objects.nonNull(entity.getUpArea())) {
+				if (entity.getUpArea().compareTo(entity.getLowArea()) < 0) {
+					R.fail("单面积上限不能小于单面积下限") ;
+				}
 			}
+
 			// 单批面积区间
-			if (entity.getSingleUpArea().compareTo(entity.getSingleDownArea()) < 0) {
-				R.fail("单批面积上限不能小于单批面积下限");
+			if (Objects.nonNull(entity.getSingleDownArea()) && Objects.nonNull(entity.getSingleUpArea())) {
+				if (entity.getSingleUpArea().compareTo(entity.getSingleDownArea()) < 0) {
+					R.fail("单批面积上限不能小于单批面积下限");
+				}
 			}
 
 			// 拼接质量等级名称