Merge branch 'BI_Dashboard' of eta_gn_server/eta_api into dm

services/bi_approve/bi_approve.go

@@ -543,7 +543,7 @@ func SolvedBiApprove(adminId, classifyId, timeType, sortField, sortRule, approve
 		order = fmt.Sprintf("%s %s", orderField, orderRule)
 	}
 	if approveState > 0 {
-		cond += fmt.Sprintf(` AND a.%s = ?`, biapprove.BiApproveRecordCols.State)
+		cond += fmt.Sprintf(` AND a.%s = ?`, biapprove.BiApproveRecordCols.NodeState)
 		pars = append(pars, approveState)
 	}
 	total, e := biapprove.GetApprovedBiApproveCount(cond, pars)