|
@@ -67,8 +67,16 @@ 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)
|
|
|
+ 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.ReportType, params.ClassifySecondId)
|
|
|
}
|
|
|
if params.ClassifyThirdId > 0 {
|