|
@@ -75,11 +75,13 @@ func (re *ReportUpdateTask) Execute(taskDetail *base.TaskDetail) error {
|
|
|
t := time.UnixMilli(timestamp)
|
|
|
filterReportList[i].PublishedTime = t.Format(time.DateTime)
|
|
|
plateId := filterReportList[i].PlateId
|
|
|
- plate, err := ht.GetPermissionNameById(plateId)
|
|
|
+ var plate ht.HTPlate
|
|
|
+ plate, err = ht.GetPermissionNameById(plateId)
|
|
|
if err != nil || plate.ParentId == 0 {
|
|
|
filterReportList[i].PermissionName = filterReportList[i].PlateName
|
|
|
} else {
|
|
|
- PermissionName, err := getPermissionNameById(plate.ParentId)
|
|
|
+ var PermissionName string
|
|
|
+ err = getPermissionNameById(plate.Id, &PermissionName)
|
|
|
if err != nil {
|
|
|
logger.Error("获取ETA研报列表失败:%v", err)
|
|
|
filterReportList[i].PermissionName = ""
|
|
@@ -104,15 +106,17 @@ func (re *ReportUpdateTask) Execute(taskDetail *base.TaskDetail) error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func getPermissionNameById(id int) (name string, err error) {
|
|
|
+func getPermissionNameById(id int, currentName *string) (err error) {
|
|
|
plate, err := ht.GetPermissionNameById(id)
|
|
|
if err != nil {
|
|
|
+ logger.Error("查询海通板块品种名称失败:%v", err)
|
|
|
return
|
|
|
}
|
|
|
if plate.ParentId != 0 {
|
|
|
- return getPermissionNameById(plate.ParentId)
|
|
|
+ *currentName = plate.PlateName
|
|
|
+ return getPermissionNameById(plate.ParentId, currentName)
|
|
|
} else {
|
|
|
- return plate.PlateName, nil
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
|