|
@@ -326,7 +326,7 @@ func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule
|
|
|
if orderRule != "" {
|
|
if orderRule != "" {
|
|
|
order = ` ORDER BY ` + orderRule
|
|
order = ` ORDER BY ` + orderRule
|
|
|
}
|
|
}
|
|
|
- sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.state AS record_state,a.node_state,a.node_approve_time, a.approve_time AS handle_time, b.*
|
|
|
|
|
|
|
+ sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.state AS record_state,a.node_state,a.node_approve_time, a.node_approve_time AS handle_time, b.*
|
|
|
FROM report_approve_record AS a
|
|
FROM report_approve_record AS a
|
|
|
JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
|
|
JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
|
|
|
WHERE 1 = 1 %s %s
|
|
WHERE 1 = 1 %s %s
|
