|
|
@@ -568,7 +568,6 @@
|
|
|
left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
|
|
|
<where>
|
|
|
fs_user.is_del = 0
|
|
|
- where fs_user.is_del = 0
|
|
|
<if test="userId != null">
|
|
|
AND fs_user.user_id = #{userId}
|
|
|
</if>
|
|
|
@@ -599,6 +598,7 @@
|
|
|
<if test="projectId != null">
|
|
|
AND ucu.project_id = #{projectId}
|
|
|
</if>
|
|
|
+ </where>
|
|
|
limit ${(pageNum-1)*pageSize},${pageSize}
|
|
|
</select>
|
|
|
|
|
|
@@ -678,7 +678,7 @@
|
|
|
<if test="tabValue != null and tabValue !='' ">
|
|
|
<choose>
|
|
|
<when test = "tabValue == 1">
|
|
|
- AND DAY(fs_user.create_time) = DAY(NOW())
|
|
|
+ AND DAY(fs_user_company_user.create_time) = DAY(NOW())
|
|
|
</when>
|
|
|
<when test = "tabValue == 2">
|
|
|
AND DAY(fs_user_course_count.complete_watch_date) = DAY(NOW())
|
