fix:excel保存

controllers/target.go

@@ -4016,6 +4016,20 @@ func (this *TargetController) ExcelDataAdd() {
 		br.Msg = "获取分类数据失败"
 		return
 	}
+	IsVaild := 0
+	for _, classifyId := range classifyIdStrList {
+		if strconv.Itoa(req.ClassifyId) == classifyId {
+			IsVaild += 1
+		}
+		if strconv.Itoa(req.OldClassifyId) == classifyId {
+			IsVaild += 1
+		}
+	}
+	if IsVaild != 2 {
+		br.Msg = "操作权限不足，请检查分类操作权限"
+		br.ErrMsg = "操作权限不足"
+		return
+	}
 
 	// 获取当前类所有的有效指标
 	list, err := models.GetTargetItemListSort(req.ClassifyId, 1, req.Frequence, "", "", classifyIdStrList)

models/db.go

@@ -23,9 +23,10 @@ import (
 	"eta/eta_api/models/system"
 	"eta/eta_api/models/yb"
 	"eta/eta_api/utils"
-	_ "github.com/go-sql-driver/mysql"
 	"time"
 
+	_ "github.com/go-sql-driver/mysql"
+
 	"github.com/beego/beego/v2/client/orm"
 )
 
@@ -102,6 +103,7 @@ func init() {
 		new(VarietyTag),                 // 标签表
 		new(ResearchVarietyTagRelation), // 研究员标签关系表
 		new(ReportPptImg),               //Ppt转报告的图片记录表
+		new(EdbinfoUser),
 	)
 
 	// 系统表 数据表

models/target.go

@@ -181,15 +181,15 @@ type Edbinfo struct {
 	SecName      string `orm:"column(SEC_NAME);" description:"指标名称"`
 	Unit         string `orm:"column(UNIT);" description:"单位"`
 	Remark       string `orm:"column(REMARK);" description:"备注"`
-	Frequency    string `description:"频度"`
-	ClassifyId   int    `description:"分类id"`
-	ClassifyName string `description:"分类名称"`
-	CreateDate   string `description:"创建时间"`
-	UserId       int    `description:"录入用户id"`
-	UserName     string `description:"录入用户名称"`
-	NoticeTime   string `description:"通知时间"`
-	Mobile       string `description:"录入者手机号"`
-	Sort         int    `description:"排序"`
+	Frequency    string `orm:"column(frequency)" description:"频度"`
+	ClassifyId   int    `orm:"column(classify_id)" description:"分类id"`
+	ClassifyName string `orm:"-" description:"分类名称"`
+	CreateDate   string `orm:"column(create_date)" description:"创建时间"`
+	UserId       int    `orm:"column(user_id)" description:"录入用户id"`
+	UserName     string `orm:"-" description:"录入用户名称"`
+	NoticeTime   string `orm:"column(notice_time)" description:"通知时间"`
+	Mobile       string `orm:"column(mobile)" description:"录入者手机号"`
+	Sort         int    `orm:"column(sort)" description:"排序"`
 }
 
 func DeleteEdbinfoByTraceCodeList(tradeCodeList []string) (err error) {
@@ -327,10 +327,15 @@ func GetEdbinfoBySecNameList(secNameList []string) (items []*Edbinfo, err error)
 	}
 	sql := `SELECT * FROM edbinfo WHERE  left(TRADE_CODE,1)='W' AND REMARK='手动' `
 	if len(secNameList) > 0 {
-		sql += " AND SEC_NAME IN (" + strings.Join(secNameList, ",") + ") "
+		var holder []string
+		for range secNameList {
+			holder = append(holder, "?")
+		}
+
+		sql += " AND SEC_NAME IN (" + strings.Join(holder, ",") + ") "
 	}
 	o := orm.NewOrmUsingDB("edb")
-	err = o.Raw(sql).QueryRow(&items)
+	_, err = o.Raw(sql, secNameList).QueryRows(&items)
 	return
 }
 

services/data/edb_info.go

@@ -799,11 +799,11 @@ func MultiAddEdbInfo(edbInfoList []*models.Edbinfo, mobile string) (msg string,
 		return
 	}
 	if len(items) > 0 {
-		msg = "指标名称已存在:"
+		var existName []string
 		for _, edbInfo := range items {
-			msg += edbInfo.SecName + ","
+			existName = append(existName, edbInfo.SecName)
 		}
-		msg = msg[:len(msg)-2]
+		msg = fmt.Sprintf("指标名称已存在:%s", strings.Join(existName, ","))
 		err = errors.New("指标名称已存在")
 		return
 	}