|
@@ -135,10 +135,10 @@ func GetSelfContractApprovalRecordList(contractApprovalIds string, approveUserId
|
|
SELECT
|
|
SELECT
|
|
a.* from contract_approval_record a
|
|
a.* from contract_approval_record a
|
|
join contract_approval b on a.contract_approval_id = b.contract_approval_id
|
|
join contract_approval b on a.contract_approval_id = b.contract_approval_id
|
|
-WHERE a.contract_approval_id in (` + contractApprovalIds + `) AND (approve_user_id = ? or approve_user_id=0)
|
|
|
|
|
|
+WHERE a.contract_approval_id in (` + contractApprovalIds + `) AND (approve_user_id = ? or approve_user_id=?)
|
|
and a.node_id<=b.curr_node_id`
|
|
and a.node_id<=b.curr_node_id`
|
|
sql += ` order by contract_approval_record_id desc `
|
|
sql += ` order by contract_approval_record_id desc `
|
|
- _, err = o.Raw(sql, approveUserId).QueryRows(&list)
|
|
|
|
|
|
+ _, err = o.Raw(sql, approveUserId, approveUserId).QueryRows(&list)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|