术语命名特殊字符过滤及关系新增修改

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -445,10 +445,6 @@ public class ConceptFacade extends ConceptServiceImpl {
                                     sbf.append("第" + count + "行数据不完整；").append("<br/>");
                                     continue;
                                 }
-                                if(libName.matches(regEx)||otherNames.matches(regEx)){
-                                	 sbf.append("第" + count + "行无法导入，导入数据无法为纯数字或特殊字符；").append("<br/>");
-                                     continue;
-                                }
                                 if(StringUtil.isNotEmpty(remark)&&remark.length()>120){
                                 	 sbf.append("第" + count + "行导入错误，说明最大可输入120个字；").append("<br/>");
                                      continue;
@@ -463,6 +459,10 @@ public class ConceptFacade extends ConceptServiceImpl {
                                 	if(StringUtil.isBlank(nm)){
                                 		continue;
                                 	}
+                                	if(nm.matches(regEx)){
+                                		sbf.append("第" + count + "行无法导入，导入数据无法为纯数字或纯特殊字符；").append("<br/>");
+                                   	 	break;
+                                	}
                                 	if(nm.length()>30){
                                 		sbf.append("第" + count + "行导入错误，标准词和同义词最大字数不可超过30个字；").append("<br/>");
                                         break;

knowledgeman-service/src/main/java/com/diagbot/facade/RelationFacade.java

@@ -173,7 +173,11 @@ public class RelationFacade extends RelationServiceImpl {
 		
 		Relation relation = (Relation)ckMap.get("relation");
 		if(relation.getId()!=null){
-			throw new CommonException(CommonErrorCode.RPC_ERROR,"该数据已存在");
+			if(relation.getIsDeleted().equals("Y")){
+				throw new CommonException(CommonErrorCode.RPC_ERROR,"该数据已经建立且处于已删除状态，可前往列表中恢复该条数据！");
+			}else{
+				throw new CommonException(CommonErrorCode.RPC_ERROR,"该数据已存在！");
+			}
 		}
 		
 		return saveOrUpdate((Relation)(ckMap.get("relation")));