|
|
@@ -400,7 +400,7 @@
|
|
|
LEFT JOIN fs_user_course_count ON fs_user.user_id = fs_user_course_count.user_id
|
|
|
LEFT JOIN company_tag_user ON fs_user.user_id = company_tag_user.user_id
|
|
|
LEFT JOIN company_tag ON FIND_IN_SET(company_tag.tag_id, company_tag_user.tag_ids) > 0
|
|
|
- where company_user.parent_id = #{userId}
|
|
|
+ where (company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
|
<if test="companyUserId != null and companyUserId !='' ">
|
|
|
and company_user.user_id = #{companyUserId}
|
|
|
</if>
|
|
|
@@ -465,6 +465,9 @@
|
|
|
</when>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+
|
|
|
+ group by fs_user.user_id
|
|
|
+
|
|
|
<if test="continueMissCourseSort != null and continueMissCourseSort !='' ">
|
|
|
order by
|
|
|
<choose>
|
|
|
@@ -482,7 +485,6 @@
|
|
|
</when>
|
|
|
</choose>
|
|
|
</if>
|
|
|
-
|
|
|
</select>
|
|
|
|
|
|
<select id="getUserNumber" resultType="UserListCountVO">
|
