|
@@ -398,7 +398,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 1 = 1
|
|
|
+ where fs_user.is_del = 0
|
|
|
<if test="userId != null and userId !='' ">
|
|
|
and (company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
|
</if>
|
|
@@ -502,6 +502,7 @@
|
|
|
LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
|
|
|
WHERE
|
|
|
(company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
|
+ and fs_user.is_del = 0
|
|
|
GROUP BY
|
|
|
fs_user.`status`
|
|
|
</select>
|
|
@@ -630,11 +631,12 @@
|
|
|
WHERE (
|
|
|
company_user.user_id = #{userId}
|
|
|
OR company_user.parent_id = #{userId}
|
|
|
- )) as userTotal,
|
|
|
+ ) and fs_user.is_del = 0) as userTotal,
|
|
|
(SELECT count(fs_user.user_id)
|
|
|
FROM fs_user
|
|
|
LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
|
|
|
WHERE (company_user.user_id = #{userId} OR company_user.parent_id = #{userId})
|
|
|
+ and fs_user.is_del = 0
|
|
|
AND to_days(fs_user.create_time) = to_days(now())) as todayNewUser
|
|
|
</select>
|
|
|
|
|
@@ -1147,6 +1149,7 @@
|
|
|
LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
|
|
|
WHERE
|
|
|
company_user.user_id = #{companyUserId}
|
|
|
+ and fs_user.is_del = 0
|
|
|
AND to_days( fs_user.create_time ) = to_days(
|
|
|
now())
|
|
|
) AS todayNewUser
|