|
@@ -332,7 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="selectFsUserPageListNew" resultType="com.fs.store.vo.h5.FsUserPageListVO">
|
|
<select id="selectFsUserPageListNew" resultType="com.fs.store.vo.h5.FsUserPageListVO">
|
|
|
- SELECT
|
|
|
|
|
|
|
+ SELECT DISTINCT
|
|
|
fs_user.user_id,
|
|
fs_user.user_id,
|
|
|
fs_user.nick_name as nickname,
|
|
fs_user.nick_name as nickname,
|
|
|
fs_user.avatar,
|
|
fs_user.avatar,
|
|
@@ -345,13 +345,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
ucu.company_id,
|
|
ucu.company_id,
|
|
|
ucu.project_id,
|
|
ucu.project_id,
|
|
|
fs_user.integral,
|
|
fs_user.integral,
|
|
|
- fucp.period_name,
|
|
|
|
|
|
|
+ (SELECT fucp2.period_name FROM fs_course_watch_log fcwl2
|
|
|
|
|
+ LEFT JOIN fs_user_course_period fucp2 ON fcwl2.period_id = fucp2.period_id
|
|
|
|
|
+ WHERE fcwl2.user_id = fs_user.user_id
|
|
|
|
|
+ ORDER BY fcwl2.last_heartbeat_time DESC LIMIT 1) as period_name,
|
|
|
if(fs_user.pay_count>0,1,0) as isBuy
|
|
if(fs_user.pay_count>0,1,0) as isBuy
|
|
|
FROM
|
|
FROM
|
|
|
fs_user
|
|
fs_user
|
|
|
left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
|
|
left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
|
|
|
- left join fs_course_watch_log fcwl on fs_user.user_id = fcwl.user_id
|
|
|
|
|
- left join fs_user_course_period fucp on fcwl.period_id = fucp.period_id
|
|
|
|
|
<where>
|
|
<where>
|
|
|
fs_user.is_del = 0
|
|
fs_user.is_del = 0
|
|
|
<if test="userId != null">
|
|
<if test="userId != null">
|