|
|
@@ -235,7 +235,7 @@
|
|
|
FROM commission_declare AS `declare`
|
|
|
WHERE `declare`.business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE'
|
|
|
AND deleted = 0
|
|
|
- ) AS eDeclare ON eDeclare.business_id = assets.id AND eDeclare.production_id = production.id
|
|
|
+ ) AS eDeclare ON IF(eDeclare.production_id IS NULL,eDeclare.business_id = assets.id,eDeclare.business_id = assets.id AND eDeclare.production_id = production.id)
|
|
|
LEFT JOIN (
|
|
|
SELECT business_id,production_id,declare_result
|
|
|
FROM commission_declare AS `declare`
|
