From b10f7dc5c05062e6792f522ae1fb4de446189d3e Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期二, 16 七月 2024 17:44:39 +0800
Subject: [PATCH] 区间合并，检验下单时型号参数匹配
---
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 878ddeb..dda239a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -340,14 +340,18 @@
str.setTemplateId(null);
}
try {
- if (list1.get(22) != null) {
+ if (list1.get(22) != null && list1.get(22) != "") {
str.setInspectionItemClass(list1.get(22) + "");
+ } else {
+ str.setInspectionItemClass(null);
}
} catch (Exception e) {
}
try {
- if (list1.get(23) != null) {
+ if (list1.get(23) != null && list1.get(23) != "") {
str.setInspectionItemClassEn(list1.get(23) + "");
+ } else {
+ str.setInspectionItemClassEn(null);
}
} catch (Exception e) {
}
--
Gitblit v1.9.3