|
@@ -521,15 +521,17 @@ func (this *EnglishReportController) ListReport() {
|
|
|
for _, item := range list {
|
|
|
classifyIdSecondSlice = append(classifyIdSecondSlice, item.ClassifyIdSecond)
|
|
|
}
|
|
|
- nameList, err := models.GetEnglishClassifyFullNameByIds(classifyIdSecondSlice)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取分类名称失败"
|
|
|
- br.ErrMsg = "获取分类名称失败, ERR:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
|
|
|
- for _, v := range nameList {
|
|
|
- classifyNameMap[v.Id] = v
|
|
|
+ if len(classifyIdSecondSlice) > 0 {
|
|
|
+ nameList, err := models.GetEnglishClassifyFullNameByIds(classifyIdSecondSlice)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取分类名称失败"
|
|
|
+ br.ErrMsg = "获取分类名称失败, ERR:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, v := range nameList {
|
|
|
+ classifyNameMap[v.Id] = v
|
|
|
+ }
|
|
|
}
|
|
|
for _, item := range list {
|
|
|
if item.State == 2 {
|