|
|
@@ -651,14 +651,6 @@
|
|
|
<if test="projectId != null">
|
|
|
AND fs_user_company_user.project_id = #{projectId}
|
|
|
</if>
|
|
|
- <choose>
|
|
|
- <when test = "isBlack">
|
|
|
- AND (fs_user.status = 0 or fs_user_company_user.is_repeat_fans = 1)
|
|
|
- </when>
|
|
|
- <otherwise>
|
|
|
- AND (fs_user.status = 1 and (fs_user_company_user.is_repeat_fans = 0 or fs_user_company_user.is_repeat_fans is null ))
|
|
|
- </otherwise>
|
|
|
- </choose>
|
|
|
<if test="keyword != null and keyword !='' ">
|
|
|
AND (fs_user.nickname LIKE concat('%',#{keyword},'%')
|
|
|
or fs_user.phone LIKE concat('%',#{keyword},'%')
|
