|
|
@@ -325,7 +325,7 @@
|
|
|
SELECT distinct
|
|
|
b.total_amount,b.last_buy_time,p.pay_money as number,p.payment_id,p.pay_time,
|
|
|
u.*,
|
|
|
- fcc.watch_course_count, fcc.part_course_count, company_user.nick_name AS companyUserNickName, fcc.last_watch_date
|
|
|
+ count(l.log_id) as watch_course_count, fcc.part_course_count, company_user.nick_name AS companyUserNickName, fcc.last_watch_date
|
|
|
,company.company_name,
|
|
|
ucu.project_id,
|
|
|
ucu.id as companyUserId
|
|
|
@@ -356,6 +356,7 @@
|
|
|
left join fs_user_company_user ucu on ucu.user_id = u.user_id
|
|
|
LEFT JOIN company_user ON company_user.user_id = ucu.company_user_id
|
|
|
LEFT JOIN company on company.company_id = company_user.company_id
|
|
|
+ LEFT JOIN fs_course_watch_log l on u.user_id = l.user_id
|
|
|
<where>
|
|
|
1 = 1 and u.nickname is not null
|
|
|
<if test = "maps.nickname != null and maps.nickname !='' " >
|
ct