fix：调整不同语言版本下商品利润曲线的分类新增和编辑，指标分类的新增和编辑

controllers/data_manage/baiinfo_data.go

@@ -220,7 +220,7 @@ func (this *EdbInfoController) AddBaiinfoClassify() {
 	req.ClassifyName = strings.Replace(req.ClassifyName, "/t", "", -1)
 
 	//添加指标
-	baiinfoClassifyInfo, err, errMsg := data.AddBaiinfoClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName)
+	baiinfoClassifyInfo, err, errMsg := data.AddBaiinfoClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -236,7 +236,7 @@ func (this *EdbInfoController) AddBaiinfoClassify() {
 	if baiinfoClassifyInfo.ParentId == 0 {
 		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
 		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddBaiinfoClassify(v, baiinfoClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName)
+			_, _, tmpErrMsg := data.AddBaiinfoClassify(v, baiinfoClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 			if tmpErrMsg != `` {
 				go alarm_msg.SendAlarmMsg("SCI原始数据-添加一级分类时，默认添加二级分类失败,一级分类名称："+req.ClassifyName+",二级分类名称："+v+", Err："+tmpErrMsg, 3)
 				return

controllers/data_manage/mysteel_chemical_data.go

@@ -158,7 +158,7 @@ func (this *EdbClassifyController) AddMysteelChemicalClassify() {
 	req.ClassifyName = strings.Replace(req.ClassifyName, "/t", "", -1)
 
 	//添加指标
-	mysteelChemicalClassifyInfo, err, errMsg := data.AddMysteelChemicalClassify(req.ClassifyName, req.ParentId, req.Level, this.SysUser.AdminId, this.SysUser.RealName)
+	mysteelChemicalClassifyInfo, err, errMsg := data.AddMysteelChemicalClassify(req.ClassifyName, req.ParentId, req.Level, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -174,7 +174,7 @@ func (this *EdbClassifyController) AddMysteelChemicalClassify() {
 	if mysteelChemicalClassifyInfo.ParentId == 0 {
 		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
 		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddMysteelChemicalClassify(v, mysteelChemicalClassifyInfo.BaseFromMysteelChemicalClassifyId, mysteelChemicalClassifyInfo.Level, this.SysUser.AdminId, this.SysUser.RealName)
+			_, _, tmpErrMsg := data.AddMysteelChemicalClassify(v, mysteelChemicalClassifyInfo.BaseFromMysteelChemicalClassifyId, mysteelChemicalClassifyInfo.Level, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 			if tmpErrMsg != `` {
 				go alarm_msg.SendAlarmMsg("钢联化工-添加一级分类时，默认添加二级分类失败,一级分类名称："+req.ClassifyName+",二级分类名称："+v+", Err："+tmpErrMsg, 3)
 				return

controllers/data_manage/sci_data.go

@@ -220,7 +220,7 @@ func (this *EdbInfoController) AddSciClassify() {
 	req.ClassifyName = strings.Replace(req.ClassifyName, "/t", "", -1)
 
 	//添加指标
-	sciClassifyInfo, err, errMsg := data.AddSciClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName)
+	sciClassifyInfo, err, errMsg := data.AddSciClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -236,7 +236,7 @@ func (this *EdbInfoController) AddSciClassify() {
 	if sciClassifyInfo.ParentId == 0 {
 		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
 		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddSciClassify(v, sciClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName)
+			_, _, tmpErrMsg := data.AddSciClassify(v, sciClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 			if tmpErrMsg != `` {
 				go alarm_msg.SendAlarmMsg("SCI原始数据-添加一级分类时，默认添加二级分类失败,一级分类名称："+req.ClassifyName+",二级分类名称："+v+", Err："+tmpErrMsg, 3)
 				return

controllers/data_manage/smm_data.go

@@ -269,7 +269,7 @@ func (this *EdbInfoController) AddSmmClassify() {
 	req.ClassifyName = strings.Replace(req.ClassifyName, "/t", "", -1)
 
 	//添加指标
-	smmClassifyInfo, err, errMsg := data.AddSmmClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName)
+	smmClassifyInfo, err, errMsg := data.AddSmmClassify(req.ClassifyName, req.ParentId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -285,7 +285,7 @@ func (this *EdbInfoController) AddSmmClassify() {
 	if smmClassifyInfo.ParentId == 0 {
 		secondClassifyList := []string{"价格", "供应", "需求", "库存"}
 		for _, v := range secondClassifyList {
-			_, _, tmpErrMsg := data.AddSmmClassify(v, smmClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName)
+			_, _, tmpErrMsg := data.AddSmmClassify(v, smmClassifyInfo.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName, this.Lang)
 			if tmpErrMsg != `` {
 				go alarm_msg.SendAlarmMsg("SMM原始数据-添加一级分类时，默认添加二级分类失败,一级分类名称："+req.ClassifyName+",二级分类名称："+v+", Err："+tmpErrMsg, 3)
 				return

services/data/base_from_baiinfo.go

@@ -9,16 +9,27 @@ import (
 )
 
 // AddBaiinfoClassify 添加SCI分类
-func AddBaiinfoClassify(classifyName string, parentId, sysUserId int, sysUserName string) (classifyInfo *data_manage.BaseFromBaiinfoClassify, err error, errMsg string) {
-	count, err := data_manage.GetBaseFromBaiinfoClassifyCount(classifyName, parentId)
-	if err != nil {
-		errMsg = `判断名称是否已存在失败`
-		return
-	}
-	if count > 0 {
-		errMsg = `分类名称已存在，请重新输入`
-		return
+func AddBaiinfoClassify(classifyName string, parentId, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.BaseFromBaiinfoClassify, err error, errMsg string) {
+	// 校验分类名称相同的数量
+	{
+		var count int
+		switch lang {
+		case utils.LangEn:
+			count, err = data_manage.GetBaseFromBaiinfoClassifyEnCount(classifyName, parentId)
+		default:
+			count, err = data_manage.GetBaseFromBaiinfoClassifyCount(classifyName, parentId)
+		}
+		if err != nil {
+			errMsg = `判断名称是否已存在失败`
+			return
+		}
+		if count > 0 {
+			errMsg = `分类名称已存在，请重新输入`
+			err = errors.New(errMsg)
+			return
+		}
 	}
+
 	level := 1
 	if parentId > 0 {
 		parentClassify, e := data_manage.GetBaseFromBaiinfoClassifyById(parentId)
@@ -66,7 +77,6 @@ func EditBaiinfoClassify(classifyId int, classifyName, lang string, sysUser *sys
 
 	switch lang {
 	case utils.LangEn:
-
 		// 名字相同，那么就直接返回
 		if item.ClassifyNameEn == classifyName {
 			return

services/data/base_from_sci.go

@@ -9,15 +9,25 @@ import (
 )
 
 // AddSciClassify 添加SCI分类
-func AddSciClassify(classifyName string, parentId, sysUserId int, sysUserName string) (classifyInfo *data_manage.BaseFromSciClassify, err error, errMsg string) {
-	count, err := data_manage.GetBaseFromSciClassifyCount(classifyName, parentId)
-	if err != nil {
-		errMsg = `判断名称是否已存在失败`
-		return
-	}
-	if count > 0 {
-		errMsg = `分类名称已存在，请重新输入`
-		return
+func AddSciClassify(classifyName string, parentId, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.BaseFromSciClassify, err error, errMsg string) {
+	// 校验分类名称相同的数量
+	{
+		var count int
+		switch lang {
+		case utils.LangEn:
+			count, err = data_manage.GetBaseFromSciClassifyEnCount(classifyName, parentId)
+		default:
+			count, err = data_manage.GetBaseFromSciClassifyCount(classifyName, parentId)
+		}
+		if err != nil {
+			errMsg = `判断名称是否已存在失败`
+			return
+		}
+		if count > 0 {
+			errMsg = `分类名称已存在，请重新输入`
+			err = errors.New(errMsg)
+			return
+		}
 	}
 	level := 1
 	if parentId > 0 {

services/data/base_from_smm.go

@@ -379,16 +379,27 @@ func getApiData(token string, apiName string, sdatetime string, edatetime string
 }
 
 // AddSmmClassify 添加SMM分类
-func AddSmmClassify(classifyName string, parentId, sysUserId int, sysUserName string) (classifyInfo *data_manage.BaseFromSmmClassify, err error, errMsg string) {
-	count, err := data_manage.GetBaseFromSmmClassifyCount(classifyName, parentId)
-	if err != nil {
-		errMsg = `判断名称是否已存在失败`
-		return
-	}
-	if count > 0 {
-		errMsg = `分类名称已存在，请重新输入`
-		return
+func AddSmmClassify(classifyName string, parentId, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.BaseFromSmmClassify, err error, errMsg string) {
+	// 校验分类名称相同的数量
+	{
+		var count int
+		switch lang {
+		case utils.LangEn:
+			count, err = data_manage.GetBaseFromSmmClassifyEnCount(classifyName, parentId)
+		default:
+			count, err = data_manage.GetBaseFromSmmClassifyCount(classifyName, parentId)
+		}
+		if err != nil {
+			errMsg = `判断名称是否已存在失败`
+			return
+		}
+		if count > 0 {
+			errMsg = `分类名称已存在，请重新输入`
+			err = errors.New(errMsg)
+			return
+		}
 	}
+
 	level := 1
 	if parentId > 0 {
 		parentClassify, e := data_manage.GetBaseFromSmmClassifyById(parentId)

services/data/chart_classify.go

@@ -239,26 +239,18 @@ func HandleNoPermissionChart(allNodes []*data_manage.ChartClassifyItems, noPermi
 func AddChartClassify(chartClassifyName string, parentId, level, source int, lang string, sysUser *system.Admin) (classifyInfo *data_manage.ChartClassify, err error, errMsg string, isSendEmail bool) {
 	isSendEmail = true
 	errMsg = "保存分类失败"
-	// 版本校验
-	switch lang {
-	case utils.LangEn:
-		count, tmpErr := data_manage.GetChartClassifyEnCount(chartClassifyName, parentId, source)
-		if tmpErr != nil {
-			errMsg = "判断名称是否已存在失败"
-			err = tmpErr
-			return
-		}
-		if count > 0 {
-			errMsg = "分类名称已存在，请重新输入"
-			err = errors.New(errMsg)
-			isSendEmail = false
-			return
+
+	// 校验分类名称相同的数量
+	{
+		var count int
+		switch lang {
+		case utils.LangEn:
+			count, err = data_manage.GetChartClassifyEnCount(chartClassifyName, parentId, source)
+		default:
+			count, err = data_manage.GetChartClassifyCount(chartClassifyName, parentId, source)
 		}
-	default:
-		count, tmpErr := data_manage.GetChartClassifyCount(chartClassifyName, parentId, source)
-		if tmpErr != nil {
+		if err != nil {
 			errMsg = "判断名称是否已存在失败"
-			err = tmpErr
 			return
 		}
 		if count > 0 {

services/data/edb_classify.go

@@ -253,24 +253,16 @@ func GetEdbClassifyNameListByAdminId(adminId int64) (classifyNameList []string,
 
 // AddEdbClassify 添加指标分类
 func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.EdbClassify, err error, errMsg string) {
-	// 版本校验
-	switch lang {
-	case utils.LangEn:
-		count, tmpErr := data_manage.GetEdbClassifyEnCount(classifyName, parentId, classifyType)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsg = `判断名称是否已存在失败`
-			return
-		}
-		if count > 0 {
-			errMsg = `分类名称已存在，请重新输入`
-			err = errors.New(errMsg)
-			return
+	// 校验分类名称相同的数量
+	{
+		var count int
+		switch lang {
+		case utils.LangEn:
+			count, err = data_manage.GetEdbClassifyEnCount(classifyName, parentId, classifyType)
+		default:
+			count, err = data_manage.GetEdbClassifyCount(classifyName, parentId, classifyType)
 		}
-	default:
-		count, tmpErr := data_manage.GetEdbClassifyCount(classifyName, parentId, classifyType)
-		if tmpErr != nil {
-			err = tmpErr
+		if err != nil {
 			errMsg = `判断名称是否已存在失败`
 			return
 		}

services/data/mysteel_chemical.go

@@ -13,15 +13,25 @@ import (
 )
 
 // AddMysteelChemicalClassify 添加钢联化工分类
-func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId int, sysUserName string) (classifyInfo *data_manage.BaseFromMysteelChemicalClassify, err error, errMsg string) {
-	count, err := data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, parentId)
-	if err != nil {
-		errMsg = `判断名称是否已存在失败`
-		return
-	}
-	if count > 0 {
-		errMsg = `分类名称:` + classifyName + ` 已存在，请重新输入`
-		return
+func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId int, sysUserName, lange string) (classifyInfo *data_manage.BaseFromMysteelChemicalClassify, err error, errMsg string) {
+	// 校验分类名称相同的数量
+	{
+		var count int
+		switch lange {
+		case utils.LangEn:
+			count, err = data_manage.GetBaseFromMysteelChemicalClassifyEnCount(classifyName, parentId)
+		default:
+			count, err = data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, parentId)
+		}
+		if err != nil {
+			errMsg = `判断名称是否已存在失败`
+			return
+		}
+		if count > 0 {
+			errMsg = `分类名称:` + classifyName + ` 已存在，请重新输入`
+			err = errors.New(errMsg)
+			return
+		}
 	}
 	//获取该层级下最大的排序数
 	maxSort, err := data_manage.GetBaseFromMysteelChemicalClassifyMaxSort(parentId)