fix:研报审批流列表筛选

controllers/report_approve/report_approve_flow.go

@@ -67,13 +67,21 @@ func (this *ReportApproveFlowController) List() {
 			cond += fmt.Sprintf(` AND %s LIKE ?`, report_approve.ReportApproveFlowCols.FlowName)
 			pars = append(pars, kw)
 		}
-		if params.ReportType > 0 && params.ClassifySecondId > 0 {
-			cond += fmt.Sprintf(` AND %s = ? AND %s = ?`, report_approve.ReportApproveFlowCols.ReportType, report_approve.ReportApproveFlowCols.ClassifySecondId)
-			pars = append(pars, params.ReportType, params.ClassifySecondId)
+		if params.ReportType > 0 {
+			cond += fmt.Sprintf(` AND %s = ? `, report_approve.ReportApproveFlowCols.ReportType)
+			pars = append(pars, params.ReportType)
+		}
+		if params.ClassifyFirstId > 0 {
+			cond += fmt.Sprintf(` AND %s = ? `, report_approve.ReportApproveFlowCols.ClassifyFirstId)
+			pars = append(pars, params.ClassifyFirstId)
+		}
+		if params.ClassifySecondId > 0 {
+			cond += fmt.Sprintf(` AND %s = ?`, report_approve.ReportApproveFlowCols.ClassifySecondId)
+			pars = append(pars, params.ClassifySecondId)
 		}
 		if params.ClassifyThirdId > 0 {
 			cond += fmt.Sprintf(` AND %s = ? `, report_approve.ReportApproveFlowCols.ClassifyThirdId)
-			pars = append(pars, params.ReportType, params.ClassifyThirdId)
+			pars = append(pars, params.ClassifyThirdId)
 		}
 		if params.SortRule > 0 {
 			orderMap := map[int]string{1: "ASC", 2: "DESC"}