From c9325d67d5ca8d303561eee3e84412513c7c7ba8 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 5 Jan 2024 13:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E6=B5=8B=E8=A3=85?=
 =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E5=9E=8B=E8=A1=A8=20=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xydl/cac/service/impl/ModevTypeServiceImpl.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java
index 2239ec0..0c09538 100644
--- a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java
@@ -6,6 +6,7 @@ import com.xydl.cac.service.ModevTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -28,7 +29,7 @@ public class ModevTypeServiceImpl implements ModevTypeService {
     public ModevType add(ModevType item) throws Exception {
         item.setId(null);
         List<ModevType> byMc = repository.findByMc(item.getMc());
-        if (!byMc.isEmpty()) {
+        if (!CollectionUtils.isEmpty(byMc)) {
             throw new Exception("该监测装置类型已存在");
         }
         return repository.save(item);
@@ -37,8 +38,12 @@ public class ModevTypeServiceImpl implements ModevTypeService {
     @Override
     public void update(ModevType item) throws Exception {
         List<ModevType> byMc = repository.findByMc(item.getMc());
-        if (!byMc.isEmpty()) {
-            throw new Exception("该监测装置类型已存在");
+        if (!CollectionUtils.isEmpty(byMc)) {
+            for (ModevType it : byMc) {
+                if (it.getId() != item.getId()) {
+                    throw new Exception("该监测装置类型已存在");
+                }
+            }
         }
         repository.save(item);
     }