|
@@ -96,7 +96,7 @@ func GetReportCountByClassifyIds(classifyFirstIds, classifySecondIds, classifyTh
|
|
|
return
|
|
|
}
|
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
|
- sql := `SELECT COUNT(*) AS count FROM report AS a WHERE (a.state=2 OR a.state=6) `
|
|
|
+ sql := `SELECT COUNT(*) AS count FROM report AS a WHERE (a.state=2 OR a.state=6) AND (1=2 `
|
|
|
|
|
|
if len(classifyFirstIds) > 0 {
|
|
|
sql += fmt.Sprintf(" OR a.classify_id_first IN (%s) ", utils.GetOrmReplaceHolder(len(classifyFirstIds)))
|
|
@@ -107,6 +107,7 @@ func GetReportCountByClassifyIds(classifyFirstIds, classifySecondIds, classifyTh
|
|
|
if len(classifyThirdIds) > 0 {
|
|
|
sql += fmt.Sprintf(" OR a.classify_id_third IN (%s) ", utils.GetOrmReplaceHolder(len(classifyThirdIds)))
|
|
|
}
|
|
|
+ sql += ` ) `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
|
}
|
|
@@ -140,7 +141,7 @@ func GetReportListByClassifyIds(classifyFirstIds, classifySecondIds, classifyThi
|
|
|
CASE WHEN DATE(a.modify_time)=DATE(NOW()) THEN 1 ELSE 0 END AS is_current_date
|
|
|
FROM report AS a
|
|
|
INNER JOIN classify AS b ON a.classify_id_second=b.id
|
|
|
- WHERE (a.state=2 OR a.state=6) `
|
|
|
+ WHERE (a.state=2 OR a.state=6) AND (1=2 `
|
|
|
// AND (a.classify_id_first IN (%s) OR a.classify_id_second IN (%s) OR a.classify_id_third IN (%s)) `
|
|
|
if len(classifyFirstIds) > 0 {
|
|
|
sql += fmt.Sprintf(" OR a.classify_id_first IN (%s) ", utils.GetOrmReplaceHolder(len(classifyFirstIds)))
|
|
@@ -151,6 +152,7 @@ func GetReportListByClassifyIds(classifyFirstIds, classifySecondIds, classifyThi
|
|
|
if len(classifyThirdIds) > 0 {
|
|
|
sql += fmt.Sprintf(" OR a.classify_id_third IN (%s) ", utils.GetOrmReplaceHolder(len(classifyThirdIds)))
|
|
|
}
|
|
|
+ sql += `) `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
|
}
|