|
@@ -925,6 +925,7 @@ func (this *MaterialController) MyChartSaveAsMaterial() {
|
|
|
return
|
|
|
}
|
|
|
existList := make([]*material.Material, 0)
|
|
|
+ existNameMap := make(map[string]struct{})
|
|
|
switch this.Lang {
|
|
|
case utils.LANG_EN:
|
|
|
existList, err = material.GetMaterialByNameEns(materialNames)
|
|
@@ -934,12 +935,9 @@ func (this *MaterialController) MyChartSaveAsMaterial() {
|
|
|
return
|
|
|
}
|
|
|
if len(existList) > 0 {
|
|
|
- msg := "图片名称:"
|
|
|
for _, v := range existList {
|
|
|
- msg += v.MaterialNameEn + " "
|
|
|
+ existNameMap[v.MaterialNameEn] = struct{}{}
|
|
|
}
|
|
|
- br.Msg = fmt.Sprintf("%s 已存在", msg)
|
|
|
- return
|
|
|
}
|
|
|
default:
|
|
|
// 判断文件名是否已存在
|
|
@@ -950,14 +948,17 @@ func (this *MaterialController) MyChartSaveAsMaterial() {
|
|
|
return
|
|
|
}
|
|
|
if len(existList) > 0 {
|
|
|
- msg := "图片名称:"
|
|
|
for _, v := range existList {
|
|
|
- msg += v.MaterialName + " "
|
|
|
+ existNameMap[v.MaterialName] = struct{}{}
|
|
|
}
|
|
|
- br.Msg = fmt.Sprintf("%s 已存在", msg)
|
|
|
- return
|
|
|
}
|
|
|
}
|
|
|
+ if len(existList) > 0 {
|
|
|
+ br.Msg = "图片名称已存在"
|
|
|
+ respData := materialService.GetMyChartExistMaterialNameListMsg(existNameMap, req.MaterialList)
|
|
|
+ br.Data = respData
|
|
|
+ return
|
|
|
+ }
|
|
|
if len(req.MaterialList) > 30 {
|
|
|
br.Msg = "最多支持选择30个图表"
|
|
|
return
|