Merge branch 'debug'

models/permission.go

@@ -98,7 +98,7 @@ func GetClassifyIdByPermissionIds(permissionIds []int) (classifyIds []int, err e
 	if len(permissionIds) == 0 {
 		return
 	}
-	sql := `SELECT distinct classify_id FROM permission_classify_mapping  where permission_id in (?) order by permission_id asc`
+	sql := `SELECT distinct classify_id FROM permission_classify_mapping  where permission_id in (` + utils.GetOrmReplaceHolder(len(permissionIds)) + `) order by permission_id asc`
 	_, err = o.Raw(sql, permissionIds).QueryRows(&classifyIds)
 	return
 }

services/user_source_click_flow.go

@@ -112,7 +112,7 @@ func getReportPermissionNames(reportId int) (permissionNames string) {
 		return
 	}
 	if report.Source == models.SourceETA {
-		permissionIds, queryErr := models.GetByPermissionIdsByClassifyId(report.OrgId)
+		permissionIds, queryErr := models.GetByPermissionIdsByClassifyId(report.ClassifyId)
 		if queryErr != nil {
 			return
 		}
@@ -121,7 +121,9 @@ func getReportPermissionNames(reportId int) (permissionNames string) {
 			utils.FileLog.Error("获取品种名称列表失败", err.Error())
 			return
 		}
-		permissionNames = strings.Join(permissionNameList, ",")
+		if len(permissionNameList) > 0 {
+			permissionNames = strings.Join(permissionNameList, ",")
+		}
 		return
 	}
 	if report.Source == models.SourceHT {