diff --git a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java
index 2b646e510344b58eced0975bbf6a7295521846f3..0b4e57cbd50ba35c5339ad3e82bbf35a9927853f 100644
--- a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java
+++ b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java
@@ -42,7 +42,8 @@ public enum CodeEnum {
     NO_DATA("200", "数据库无数据", false),
     UP_DATA_FAIL("401005", "更新失败", false),
     INSERT_FAIL("401006", "插入数据失败", false),
-    DELETE_FAIL("401007", "修改失败", false);
+    DELETE_FAIL("401007", "修改失败", false),
+    DATA_REPETITION("250", "分类编码或分类名称重复", false);
 
     /**
      * 构造函数
diff --git a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java
index 4e513c43cdd92e33d90acded481c0af267cf8b97..c6687e56e80061988757507fbf1c54366483b719 100644
--- a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java
@@ -94,6 +94,8 @@ public class ModelClassifyController {
         Integer integer = modelClassifyService.deleteModelClassify(modelClassify.getObjId(), modelClassify.getModelGroupCode(), modelClassify.getGroupCompanyCode());
         if (integer.intValue() == -1) {
             ResponseVO.ok(ResultCode.NO_DELETE);
+        }else if (integer.intValue() == 0){
+            ResponseVO.error("前端未传入分类编码!!!");
         }
         return ResponseVO.ok(integer);
     }
@@ -105,7 +107,7 @@ public class ModelClassifyController {
      * @author huxiuwu
      * @date 2022/3/9
      **/
-    @ApiOperation("删除")
+    //@ApiOperation("删除")
     @GetMapping("/delete")
     public ResponseVO delete(String modelGroupCode) {
         return modelClassifyService.delete(modelGroupCode);
diff --git a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java
index 4bcb25033250587c7ab303c714668ac78bfa6079..3be93a479590d314123bb21b1f2ada827fa69b84 100644
--- a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java
+++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java
@@ -82,4 +82,5 @@ public class ModelClassify {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date groupUpdateTime;
+
 }
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
index 3a2651e22abe1a4b205c181ceb5b416b6648d22b..7a2836d46898b63cabdb62d1ddb6d83779dcf009 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.common.utils.PageUtil;
 import com.pms.ocp.mapper.ModelClassifyMapper;
+import com.pms.ocp.mapper.OcpModelGroupMapper;
 import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.vo.OcpModelGroupVO;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 /**
@@ -32,6 +34,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
     @Resource
     private OcpModelGroupService ocpService;
 
+    @Resource
+    private OcpModelGroupMapper ocpModelGroupMapper;
+
     /**
      * currentPage pageSize
      * 模型分类-导航树
@@ -90,6 +95,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      **/
     @Override
     public ResponseVO update(List<ModelClassify> list) {
+        if (getModelClassify(list,()->new QueryWrapper<ModelClassify>().ne("obj_id",list.get(0).getObjId()))){
+            return ResponseVO.error(CodeEnum.DATA_REPETITION);
+        }
         boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list);
         if (!isUpdateSucceed) {
             ResponseVO.error(CodeEnum.UP_DATA_FAIL);
@@ -97,6 +105,17 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         return ResponseVO.ok();
     }
 
+    private boolean getModelClassify(List<ModelClassify> list,Supplier<QueryWrapper<ModelClassify>> supplier) {
+        ModelClassify data = list.get(0);
+        QueryWrapper<ModelClassify> queryWrapper = supplier.get();
+        queryWrapper.and(QueryWrapper-> QueryWrapper.eq("model_group_code",data.getModelGroupCode()).or().eq("model_group_name",data.getModelGroupName()));
+        List<ModelClassify> modelClassifyList = ocpModelGroupMapper.selectList(queryWrapper);
+        if (CollectionUtil.isNotEmpty(modelClassifyList)){
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 删除
      * @return pms.ocp.model.vo.ResponseVO
@@ -121,6 +140,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      **/
     @Override
     public ResponseVO insert(List<ModelClassify> list) {
+        if (getModelClassify(list,()->new  QueryWrapper<ModelClassify>())){
+            return ResponseVO.error(CodeEnum.DATA_REPETITION);
+        }
         boolean result = ocpService.saveBatch(list);
         if (!result) {
             return ResponseVO.error(CodeEnum.INSERT_FAIL);
@@ -194,22 +216,6 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         return result;
     }
 
-    /**
-     *
-     * @author huxiuwu
-     * @date 2022/3/10
-     * @param parent 父类
-     * @param treeNodes 需要遍历list
-     **/
-//    private void addLevel(OcpModelGroupVO parent, List<OcpModelGroupVO> treeNodes) {
-//        int level = parent.getLevel();
-//        parent.setLevel(level++);
-//        for (OcpModelGroupVO treeNode : treeNodes) {
-//            if (treeNode != null && parent.getModelGroupCode().equals(treeNode.getModelGroupPcode())) {
-//                addLevel(treeNode, treeNodes);
-//            }
-//        }
-//    }
     /**
      * 生成构造器
      * @author huxiuwu
@@ -247,6 +253,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         List<OcpModelGroupVO> opList = classifyMapper.selectList(queryWrapper);
 
         if (!opList.isEmpty()) {
+            if (StringUtils.isEmpty(objId)) {
+                return 0;
+            }
             if (StringUtils.isNotEmpty(objId)) {
                 queryWrapper.lambda().eq(OcpModelGroupVO::getObjId, objId);
             }
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
index c0466ca3389bdef35e5597b5478903a396e30b67..cecac406f731a986328e7ec3b7a7ce81e429cc44 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
@@ -12,9 +12,9 @@ import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelSubscribeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.LinkedList;
 import java.util.List;
@@ -28,7 +28,7 @@ import java.util.List;
 @Service
 public class ModelSubscribeServiceImpl implements ModelSubscribeService {
 
-    @Autowired
+    @Resource
     private ModelSubscribeMapper modelSubscribeMapper;
 
     @Override