|
@@ -102,14 +102,12 @@
|
|
|
f.product_id AS productId,
|
|
|
cp.product_name as productName,
|
|
|
IFNULL(u.project_id, cwjs.project_id ) AS projectId,
|
|
|
- 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,
|
|
|
+ project.project_name AS projectName,
|
|
|
IFNULL(cwjs.account_id, f.account_id) AS accountId,
|
|
|
IFNULL(u.auth_name,cwjs.account_name) AS accountName,
|
|
|
f.del_flag,
|
|
|
IFNULL(project.sale_id,cwjs.create_user_id) AS saleUserId,
|
|
|
- IFNULL((SELECT su.realname FROM sys_user su WHERE f.account_id = u.account_id AND u.project_id = project.id AND project.sale_id = su.id),
|
|
|
+ IFNULL((SELECT su.realname FROM sys_user su WHERE project.sale_id = su.id LIMIT 1),
|
|
|
(SELECT su.realname FROM sys_user su LEFT JOIN ctop_cwjs_settlement_info cwjs1 on su.id = cwjs1.create_user_id LIMIT 1 )
|
|
|
) as saleUserName,
|
|
|
f.create_user_id AS operateUserId,
|