Browse Source

修复消息研报报错

kobe6258 7 months ago
parent
commit
625567b1ce
2 changed files with 10 additions and 7 deletions
  1. 9 7
      controllers/message.go
  2. 1 0
      models/chart_permission.go

+ 9 - 7
controllers/message.go

@@ -126,14 +126,16 @@ func (this *MessageController) ReportList() {
 			br.ErrMsg = "获取eta品种信息失败,Err:" + err.Error()
 			return
 		}
-		var names []string
-		names, err = models.GetPermissionNames(list)
-		if err != nil {
-			br.Msg = "获取报告列表失败"
-			br.ErrMsg = "获取eta品种信息失败,Err:" + err.Error()
-			return
+		if len(list) > 0 {
+			var names []string
+			names, err = models.GetPermissionNames(list)
+			if err != nil {
+				br.Msg = "获取报告列表失败"
+				br.ErrMsg = "获取eta品种名称信息失败,Err:" + err.Error()
+				return
+			}
+			report.PermissionNames = strings.Join(names, ",")
 		}
-		report.PermissionNames = strings.Join(names, ",")
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(response.ReportListResp)

+ 1 - 0
models/chart_permission.go

@@ -119,6 +119,7 @@ func GetPermissionNames(ids []int) (items []string, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	condition := " AND chart_permission_id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")"
 	sql := `SELECT distinct  permission_name FROM chart_permission WHERE enabled=1 AND product_id=1` + condition
+	fmt.Println(sql)
 	_, err = o.Raw(sql, ids).QueryRows(&items)
 	return
 }