新增或者修改数据项时判断名称是否重复

src/main/java/com/keymobile/indicators/service/hytobacco/BaseIndDefService.java

@@ -29,6 +29,15 @@ public class BaseIndDefService {
 	public String saveOrUpdate(BaseIndDef baseIndDef,Integer catalogId,
 			String catalogIdPath,String user,String isUpdate,String code) 
 			throws Exception{
+		//判断名称是否重复
+		BaseIndDef baseIndDefSql = new BaseIndDef();
+		baseIndDefSql.setCatalogId(catalogId);
+        baseIndDefSql.setIndName(baseIndDef.getIndName());
+		List<BaseIndDef> select = baseIndDefMapper.select(baseIndDef);
+		if(select!=null&&select.size()>0&&!select.get(0).getIndId().equals(baseIndDef.getIndId())){
+			throw new Exception("数据项名称已存在，操作失败！！");
+		}
+
 		//判断公式合法性
 		if(StringUtils.isNotBlank(baseIndDef.getIndFormat()) && 
 				!CalculateUtils.isValidformula(baseIndDef.getIndFormat())) {