Merge branch 'yb_pc2.0' into debug

controller/pc/pc.go

@@ -191,7 +191,7 @@ func ClassifyDetailBanner(c *gin.Context) {
 			return
 		}
 
-		reportItem, err := report.GetLatestReportByClassifyName(classifyName, reportInfo.ClassifyNameSecond)
+		reportItem, err := report.GetLatestReportByClassifyName(classifyName, reportInfo.ClassifyIdSecond)
 		if err != nil {
 			response.Fail("获取报告详情失败"+err.Error(), c)
 			return

models/tables/rddp/report/query.go

@@ -380,7 +380,7 @@ func GetReportByOldReportId(oldReportId uint64)(item *Report, err error)  {
 	return
 }
 
-func GetLatestReportByClassifyName(firstName,secondName string) (items *pc.LatestReportBanner, err error) {
+func GetLatestReportByClassifyName(firstName string, secondId int) (items *pc.LatestReportBanner, err error) {
 	sql := `SELECT
 	a.id AS report_id,
 	classify_name_second,
@@ -397,11 +397,11 @@ FROM
 WHERE
 	a.state = 2 
 	AND a.classify_name_first = "%v" 
-	AND a.classify_name_second = "%v" 
-	AND a.classify_name_second = b.classify_name
+	AND a.classify_id_second = %v 
+	AND a.classify_id_second = b.id
 ORDER BY
 	publish_time DESC `
-	sql = fmt.Sprintf(sql, firstName, secondName)
+	sql = fmt.Sprintf(sql, firstName, secondId)
 	err = global.MYSQL["rddp"].Raw(sql).First(&items).Error
 	return
 }