Merge branch 'feature/eta_1.1.9' into debug

controllers/smart_report/smart_report.go

@@ -98,7 +98,7 @@ func (this *SmartReportController) Add() {
 	// 继承报告
 	if req.AddType == 2 {
 		ob := new(smart_report.SmartReport)
-		cond := ` AND classify_id_first = ? AND classify_id_second = ? AND state = 2`
+		cond := ` AND classify_id_first = ? AND classify_id_second = ?`
 		pars := make([]interface{}, 0)
 		pars = append(pars, req.ClassifyIdFirst, req.ClassifyIdSecond)
 		lastReport, e := ob.GetItemByCondition(cond, pars, "stage DESC")
@@ -1068,7 +1068,7 @@ func (this *SmartReportController) LastPublishedReport() {
 	secondId, _ := this.GetInt("ClassifyIdSecond")
 
 	ob := new(smart_report.SmartReport)
-	cond := ` AND classify_id_first = ? AND classify_id_second = ? AND state = 2`
+	cond := ` AND classify_id_first = ? AND classify_id_second = ?`
 	pars := make([]interface{}, 0)
 	pars = append(pars, firstId, secondId)
 	item, e := ob.GetItemByCondition(cond, pars, "stage DESC")