|
@@ -101,7 +101,8 @@
|
|
|
f.product_id as productId,
|
|
|
( SELECT cp.product_name FROM ctop_product cp WHERE cp.id = f.product_id LIMIT 1 ) productName,
|
|
|
IFNULL((SELECT u.project_id from ctop_user_allocation u where u.account_id = f.account_id),cwjs.project_id) as projectId,
|
|
|
- IFNULL((SELECT u.project_name from ctop_user_allocation u where u.account_id = f.account_id),(SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 )) as projectName,
|
|
|
+ IFNULL((SELECT project.project_name from ctop_user_allocation u,ctop_project project where u.account_id = f.account_id and project.id = u.project_id),
|
|
|
+ (SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 )) as projectName,
|
|
|
IFNULL(cwjs.account_id,f.account_id) as accountId,
|
|
|
IFNULL((SELECT u.auth_name from ctop_user_allocation u where u.account_id = f.account_id),cwjs.account_name) as accountName,
|
|
|
f.del_flag,
|