diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java
index bd3dc25..044d245 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java
@@ -1,5 +1,8 @@
 package com.casic.missiles.controller.equipment;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -36,6 +39,9 @@
     @ApiOperation("新增")
     @PostMapping("add")
     public ReturnDTO add(@RequestBody EquipmentModelInfo modelInfo){
+        if(!check(modelInfo)){
+            return ReturnUtil.failed("规格型号信息重复");
+        }
         modelInfoService.add(modelInfo);
         return ReturnUtil.success();
     }
@@ -43,10 +49,29 @@
     @ApiOperation("修改")
     @PostMapping("update")
     public ReturnDTO update(@RequestBody EquipmentModelInfo modelInfo){
+        if(!check(modelInfo)){
+            return ReturnUtil.failed("规格型号信息重复");
+        }
         modelInfoService.update(modelInfo);
         return ReturnUtil.success();
     }
 
+    private boolean check(EquipmentModelInfo modelInfo){
+        QueryWrapper<EquipmentModelInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("model",modelInfo.getModel());
+        queryWrapper.eq("equipment_name",modelInfo.getEquipmentName());
+        if(StrUtil.isNotEmpty(modelInfo.getHelpInstruction())){
+            queryWrapper.eq("help_instruction",modelInfo.getHelpInstruction());
+        }else {
+            queryWrapper.isNull("help_instruction");
+        }
+
+        if(ObjectUtil.isNotEmpty(modelInfo.getId())){
+            queryWrapper.ne("id",modelInfo.getId());
+        }
+        return modelInfoService.count(queryWrapper) <= 0;
+    }
+
     @ApiOperation("删除")
     @PostMapping("delete")
     public ReturnDTO delete(Long id){

diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java
index bd3dc25..044d245 100644
--- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java
+++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentModelInfoController.java
@@ -1,5 +1,8 @@
 package com.casic.missiles.controller.equipment;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -36,6 +39,9 @@
     @ApiOperation("新增")
     @PostMapping("add")
     public ReturnDTO add(@RequestBody EquipmentModelInfo modelInfo){
+        if(!check(modelInfo)){
+            return ReturnUtil.failed("规格型号信息重复");
+        }
         modelInfoService.add(modelInfo);
         return ReturnUtil.success();
     }
@@ -43,10 +49,29 @@
     @ApiOperation("修改")
     @PostMapping("update")
     public ReturnDTO update(@RequestBody EquipmentModelInfo modelInfo){
+        if(!check(modelInfo)){
+            return ReturnUtil.failed("规格型号信息重复");
+        }
         modelInfoService.update(modelInfo);
         return ReturnUtil.success();
     }
 
+    private boolean check(EquipmentModelInfo modelInfo){
+        QueryWrapper<EquipmentModelInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("model",modelInfo.getModel());
+        queryWrapper.eq("equipment_name",modelInfo.getEquipmentName());
+        if(StrUtil.isNotEmpty(modelInfo.getHelpInstruction())){
+            queryWrapper.eq("help_instruction",modelInfo.getHelpInstruction());
+        }else {
+            queryWrapper.isNull("help_instruction");
+        }
+
+        if(ObjectUtil.isNotEmpty(modelInfo.getId())){
+            queryWrapper.ne("id",modelInfo.getId());
+        }
+        return modelInfoService.count(queryWrapper) <= 0;
+    }
+
     @ApiOperation("删除")
     @PostMapping("delete")
     public ReturnDTO delete(Long id){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
index 938eb70..60c9684 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java
@@ -131,7 +131,7 @@
     private QueryWrapper<EquipmentModelInfo> commonQuery(EquipmentModelQueryForm queryForm){
         QueryWrapper<EquipmentModelInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentName()),"equipment_name",queryForm.getEquipmentName());
-        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getEquipmentName());
+        queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel());
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction());
         queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory());
         queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds());