|
|
@@ -27,7 +27,7 @@
|
|
|
COUNT(DISTINCT ec.id) AS fans_count
|
|
|
FROM qw_user qu
|
|
|
INNER JOIN qw_external_contact ec ON ec.qw_user_id = qu.id
|
|
|
- WHERE ec.create_time IS NOT NULL
|
|
|
+ WHERE ec.add_way=16 and ec.create_time IS NOT NULL
|
|
|
<if test="param.startAddTime != null and param.endAddTime != null">
|
|
|
AND ec.create_time BETWEEN #{param.startAddTime} AND #{param.endAddTime}
|
|
|
</if>
|
|
|
@@ -53,6 +53,18 @@
|
|
|
) oc ON oc.company_user_id = cu.user_id
|
|
|
|
|
|
WHERE cu.del_flag = '0'
|
|
|
+ <if test="(param.corpId != null and param.corpId != '') or (param.qwUserName != null and param.qwUserName.trim() != '')">
|
|
|
+ AND EXISTS (
|
|
|
+ SELECT 1 FROM qw_user qu_filter
|
|
|
+ WHERE qu_filter.company_user_id = cu.user_id
|
|
|
+ <if test="param.corpId != null and param.corpId != ''">
|
|
|
+ AND qu_filter.corp_id = #{param.corpId}
|
|
|
+ </if>
|
|
|
+ <if test="param.qwUserName != null and param.qwUserName.trim() != ''">
|
|
|
+ AND qu_filter.qw_user_name LIKE CONCAT('%', #{param.qwUserName}, '%')
|
|
|
+ </if>
|
|
|
+ )
|
|
|
+ </if>
|
|
|
<if test="param.companyId != null">
|
|
|
AND cu.company_id = #{param.companyId}
|
|
|
</if>
|