diff --git a/src/main/java/com/xydl/cac/repository/JgRepository.java b/src/main/java/com/xydl/cac/repository/JgRepository.java
index 4416fc9..583228b 100644
--- a/src/main/java/com/xydl/cac/repository/JgRepository.java
+++ b/src/main/java/com/xydl/cac/repository/JgRepository.java
@@ -10,5 +10,10 @@ import java.util.List;
 
 @Repository
 public interface JgRepository extends JpaRepository<Jg, Integer>, JpaSpecificationExecutor<Jg> {
+
     List<Jg> findByBdzid(Integer bdzId);
+
+    List<Jg> findByBdzidAndMc(Integer bdzId, String mc);
+
+    List<Jg> findByBdzidAndMcAndIdIsNot(Integer bdzId, String mc, Integer id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/repository/ZsbRepository.java b/src/main/java/com/xydl/cac/repository/ZsbRepository.java
index 76229ee..3c4ce6f 100644
--- a/src/main/java/com/xydl/cac/repository/ZsbRepository.java
+++ b/src/main/java/com/xydl/cac/repository/ZsbRepository.java
@@ -10,5 +10,10 @@ import java.util.List;
 
 @Repository
 public interface ZsbRepository extends JpaRepository<Zsb, Integer>, JpaSpecificationExecutor<Zsb> {
+
     List<Zsb> findByJgid(Integer jgid);
+
+    List<Zsb> findByJgidAndMc(Integer jgid, String mc);
+
+    List<Zsb> findByJgidAndMcAndIdIsNot(Integer jgid, String mc, Integer id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java
index 67bc593..23e9272 100644
--- a/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java
@@ -67,6 +67,10 @@ public class JgServiceImpl implements JgService {
         if (!optionalBdz.isPresent()) {
             throw new Exception("未找到该变电站");
         }
+        List<Jg> list = repository.findByBdzidAndMc(item.getBdzid(), item.getMc());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         return repository.save(item);
     }
 
@@ -76,6 +80,10 @@ public class JgServiceImpl implements JgService {
         if (!optionalBdz.isPresent()) {
             throw new Exception("未找到该变电站");
         }
+        List<Jg> list = repository.findByBdzidAndMcAndIdIsNot(item.getBdzid(), item.getMc(), item.getId());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         repository.save(item);
     }
 
diff --git a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java
index 496c170..58bd4d8 100644
--- a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java
@@ -87,6 +87,10 @@ public class ZsbServiceImpl implements ZsbService {
         if (!optionalLx.isPresent()) {
             throw new Exception("未找到该设备类型");
         }
+        List<Zsb> list = repository.findByJgidAndMc(item.getJgid(), item.getMc());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         return repository.save(item);
     }
 
@@ -98,6 +102,10 @@ public class ZsbServiceImpl implements ZsbService {
         if (!optionalLx.isPresent()) {
             throw new Exception("未找到该设备类型");
         }
+        List<Zsb> list = repository.findByJgidAndMcAndIdIsNot(item.getJgid(), item.getMc(), item.getId());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         repository.save(item);
     }