|
|
@@ -97,9 +97,9 @@
|
|
|
bss_ask ask
|
|
|
LEFT JOIN sys_dict_data sdd ON ask.status = sdd.dict_value
|
|
|
AND sdd.dict_type = 'bss_ask_status'
|
|
|
- LEFT JOIN mast_customer cust ON cust.customer_id = ask.customer_id and cust.farmer_id = ask.customer_id
|
|
|
+ LEFT JOIN mast_customer cust ON cust.customer_id = ask.customer_id and cust.farmer_id = ask.farmer_id
|
|
|
LEFT JOIN mast_farmer farm ON ask.farmer_id = farm.farmer_id
|
|
|
- LEFT JOIN bss_order od ON ask.order_id = od.order_id and od.farmer_id = ask.customer_id
|
|
|
+ LEFT JOIN bss_order od ON ask.order_id = od.order_id and od.farmer_id = ask.farmer_id
|
|
|
LEFT JOIN sys_user su ON ask.final_answer_user = su.user_name
|
|
|
<where>
|
|
|
<if test="id != null and id != ''">
|