|
@@ -533,18 +533,20 @@ func (r *RoadVideoController) SimpleReportList() {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if hasChild {
|
|
if hasChild {
|
|
|
|
+ classifyCondList := make([]string, 0)
|
|
if len(firstClassifyIds) > 0 {
|
|
if len(firstClassifyIds) > 0 {
|
|
- cond += ` AND classify_id_first IN ( ` + utils.GetOrmInReplace(len(firstClassifyIds)) + ` ) `
|
|
|
|
|
|
+ classifyCondList = append(classifyCondList, ` classify_id_first IN ( `+utils.GetOrmInReplace(len(firstClassifyIds))+` ) `)
|
|
pars = append(pars, firstClassifyIds)
|
|
pars = append(pars, firstClassifyIds)
|
|
}
|
|
}
|
|
if len(secondClassifyIds) > 0 {
|
|
if len(secondClassifyIds) > 0 {
|
|
- cond += ` AND classify_id_second IN ( ` + utils.GetOrmInReplace(len(secondClassifyIds)) + ` ) `
|
|
|
|
|
|
+ classifyCondList = append(classifyCondList, ` classify_id_second IN ( `+utils.GetOrmInReplace(len(secondClassifyIds))+` ) `)
|
|
pars = append(pars, secondClassifyIds)
|
|
pars = append(pars, secondClassifyIds)
|
|
}
|
|
}
|
|
if len(thirdClassifyIds) > 0 {
|
|
if len(thirdClassifyIds) > 0 {
|
|
- cond += ` AND classify_id_third IN ( ` + utils.GetOrmInReplace(len(thirdClassifyIds)) + ` ) `
|
|
|
|
|
|
+ classifyCondList = append(classifyCondList, ` classify_id_third IN ( `+utils.GetOrmInReplace(len(thirdClassifyIds))+` ) `)
|
|
pars = append(pars, thirdClassifyIds)
|
|
pars = append(pars, thirdClassifyIds)
|
|
}
|
|
}
|
|
|
|
+ cond += fmt.Sprintf(` AND (%s) `, strings.Join(classifyCondList, " OR "))
|
|
} else {
|
|
} else {
|
|
cond += ` AND 1 = 2`
|
|
cond += ` AND 1 = 2`
|
|
}
|
|
}
|