From 4eb5d44418c179f5ac087ce13311741ebad7e19b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 10:19:24 +0800
Subject: [PATCH] #新增 1. 新增逻辑分区主子表
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
index f4d140a..dce36e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
@@ -51,7 +51,7 @@
}
matnrIds.addAll(list);
}
- if (!param.getMatnrId().isEmpty()) {
+ if (!Objects.isNull(param.getMatnrId()) && !param.getMatnrId().isEmpty()) {
List<Matnr> matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>()
.select(Matnr::getId, Matnr::getGroupId)
.in(Matnr::getId, param.getMatnrId()));
@@ -61,7 +61,7 @@
matnrIds.addAll(matnrs);
}
List<LocAreaMatRela> locAreaMatRelas = new ArrayList<>();
- if (!param.getTypeId().isEmpty()) {
+ if (!Objects.isNull(param.getTypeId()) && !param.getTypeId().isEmpty()) {
for (Long typeId : param.getTypeId()) {
List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>()
.select(LocTypeRela::getLocId).eq(LocTypeRela::getTypeId, typeId));
@@ -84,8 +84,8 @@
}
}
- if (!param.getLocId().isEmpty()) {
- List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>().in(LocTypeRela::getLocId, param.getTypeId()).select(LocTypeRela::getTypeId, LocTypeRela::getLocId));
+ if (!Objects.isNull(param.getLocId()) && !param.getLocId().isEmpty()) {
+ List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>().in(LocTypeRela::getLocId, param.getLocId()).select(LocTypeRela::getTypeId, LocTypeRela::getLocId));
if (list.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氬簱浣嶆湭缁戝畾搴撲綅绫诲瀷锛侊紒");
}
--
Gitblit v1.9.1