|
@@ -562,7 +562,6 @@ func initES(reports []reportDao.Report) (err error) {
|
|
|
return
|
|
|
}
|
|
|
func InitHTReportList(list []ht.HTReport) (noRecord bool, err error) {
|
|
|
-
|
|
|
var reports []reportDao.Report
|
|
|
//获取系统中ht品种名
|
|
|
permissions, err := reportDao.GetGLAuthorNames()
|
|
@@ -576,11 +575,7 @@ func InitHTReportList(list []ht.HTReport) (noRecord bool, err error) {
|
|
|
if permission.AuthorNames != "" {
|
|
|
htRp.PublishUserName = permission.AuthorNames
|
|
|
}
|
|
|
- //authorNames := strings.Split(htRp.PublishUserName, ",")
|
|
|
- //authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
|
|
|
- //for _, authorName := range authorNamesWithOutEmpty {
|
|
|
destRp := convertHTReport(htRp, reportDao.StatusPublish)
|
|
|
- //destRp.Author = authorName
|
|
|
var coverSrc int
|
|
|
var permissionId int
|
|
|
permissionId, err = etaDao.GetPermissionIdByName(htRp.PermissionName)
|
|
@@ -771,7 +766,7 @@ func convertHTReport(etaRp ht.HTReport, status reportDao.ReportStatus) reportDao
|
|
|
CoverSrc: 0,
|
|
|
Source: reportDao.SourceHT,
|
|
|
SendStatus: reportDao.UNSEND,
|
|
|
- Status: reportDao.StatusPublish,
|
|
|
+ Status: status,
|
|
|
}
|
|
|
}
|
|
|
func convertEsReport(report reportDao.Report) ESReport {
|