diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
index c1410f477..79aed2732 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
@@ -59,6 +59,14 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
     public void addBatch(ParamsConfigVO paramsConfigVO) {
 		String paramsManifestId = paramsConfigVO.getParamsManifestId();
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigVO.getParamsConfigEOList();
+		int count = (int) paramsConfigEOList.stream().map(ParamsConfigEO::getConfigName).distinct().count();
+		if (count < paramsConfigEOList.size()) {
+			if (CutEnum.CN.getValue().equals(paramsConfigVO.getCut())) {
+				throw new JeroBootException("配置名称不能重复！");
+			} else {
+				throw new JeroBootException("Configuration Name cannot be duplicated!");
+			}
+		}
 
 		int ind = 1;
 		List<ParamsConfigEO> addConfigList = new ArrayList<>(); // 新增的配置
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index f7268d40f..6558c077b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -419,27 +419,36 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                 log.info("-------------- 开始处理需要合并的单元格 -----------------");
                 Set<SarFileCompareExcelMergeCell> mergeCellSet = new HashSet<>(mergeCells);
                 for (SarFileCompareExcelMergeCell mergeCell : mergeCellSet) {
-                    Integer leftCount = mergeCell.getLeftEnd() - mergeCell.getLeftStart() + 1;
-                    Integer rightCount = mergeCell.getRightEnd() - mergeCell.getRightStart() + 1;
+                    Integer leftCount = 0;
+                    if (ObjectUtils.isNotEmpty(mergeCell.getLeftEnd())&&ObjectUtils.isNotEmpty(mergeCell.getLeftStart())) {
+                        leftCount = mergeCell.getLeftEnd() - mergeCell.getLeftStart() + 1;
+                    }
+                    Integer rightCount = 0;
+                    if (ObjectUtils.isNotEmpty(mergeCell.getRightEnd())&&ObjectUtils.isNotEmpty(mergeCell.getRightStart())) {
+                        rightCount = mergeCell.getRightEnd() - mergeCell.getRightStart() + 1;
+                    }
                     Integer start = leftCount - rightCount >= 0 ? mergeCell.getLeftStart() : mergeCell.getRightStart();
                     log.info("-------------- 合并开始行数：" + start + " -----------------");
                     Integer end = leftCount - rightCount >= 0 ? mergeCell.getLeftEnd() : mergeCell.getRightEnd();
                     log.info("-------------- 合并结束行数: " + end + " -----------------");
                     //合并
-                    CellRangeAddress region0 = new CellRangeAddress(start, end, 0, 0);
-                    sheet.addMergedRegion(region0);
-                    CellRangeAddress region1 = new CellRangeAddress(start, end, 1, 1);
-                    sheet.addMergedRegion(region1);
-                    CellRangeAddress region2 = new CellRangeAddress(start, end, 2, 2);
-                    sheet.addMergedRegion(region2);
-                    CellRangeAddress region4 = new CellRangeAddress(start, end, 4, 4);
-                    sheet.addMergedRegion(region4);
-                    CellRangeAddress region5 = new CellRangeAddress(start, end, 5, 5);
-                    sheet.addMergedRegion(region5);
-                    CellRangeAddress region6 = new CellRangeAddress(start, end, 6, 6);
-                    sheet.addMergedRegion(region6);
-                    CellRangeAddress region7 = new CellRangeAddress(start, end, 8, 8);
-                    sheet.addMergedRegion(region7);
+                    if (ObjectUtils.isNotEmpty(start)&&ObjectUtils.isNotEmpty(end)) {
+                        CellRangeAddress region0 = new CellRangeAddress(start, end, 0, 0);
+                        sheet.addMergedRegion(region0);
+                        CellRangeAddress region1 = new CellRangeAddress(start, end, 1, 1);
+                        sheet.addMergedRegion(region1);
+                        CellRangeAddress region2 = new CellRangeAddress(start, end, 2, 2);
+                        sheet.addMergedRegion(region2);
+                        CellRangeAddress region4 = new CellRangeAddress(start, end, 4, 4);
+                        sheet.addMergedRegion(region4);
+                        CellRangeAddress region5 = new CellRangeAddress(start, end, 5, 5);
+                        sheet.addMergedRegion(region5);
+                        CellRangeAddress region6 = new CellRangeAddress(start, end, 6, 6);
+                        sheet.addMergedRegion(region6);
+                        CellRangeAddress region7 = new CellRangeAddress(start, end, 8, 8);
+                        sheet.addMergedRegion(region7);
+                    }
+
                 }
                 log.info("-------------- 单元格合并成功 -----------------");
             }
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 16acba02c..32a5c2c11 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -32,10 +32,10 @@
                   <div class="title-text">
                     <span class="Required">*</span>
                     <span class="title-text-text"
-                          :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
+                          :title="$t('classification')">{{$t('classification')}}</span>
                   </div>
                   <a-form-model-item class="itemModel itemModel-multi" prop="problemType">
-                    <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
+                    <a-select :placeholder="$t('PleaseSelect')+$t('classification')"
                               @change="problemTypeChange"
                               mode="multiple"
                               v-model="formInline.problemType">