From ef283145e01530612bca0d5cb1d8c718a94a82c9 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 23 Oct 2024 17:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InventoryAndWarehousingServiceImpl.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
index a659a96..d1a1d5f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
@@ -97,7 +97,8 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
         //判断提交表单中是否存在相同编码
         for (int i = 0; i < machIneDtoList.size() - 1; i++) {
             for (int j = i + 1; j < machIneDtoList.size(); j++) {
-                if (machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) {
+                if (StringUtils.isNotEmpty(machIneDtoList.get(i).getMaCode()) && StringUtils.isNotEmpty(machIneDtoList.get(j).getMaCode())
+                        && machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) {
                     throw new ServiceException("列表中包含以下相同的设备编码，请修改后重新提交：" + machIneDtoList.get(i).getMaCode());
                 }
             }