|
|
@ -31,9 +31,9 @@ |
|
|
|
FROM |
|
|
|
FROM |
|
|
|
common_push_blacklist bl JOIN sys_user u |
|
|
|
common_push_blacklist bl JOIN sys_user u |
|
|
|
ON |
|
|
|
ON |
|
|
|
bl.concern_user_id = u.id |
|
|
|
bl.fan_user_id = u.id |
|
|
|
<where> |
|
|
|
<where> |
|
|
|
u.del_flag = 0 AND u.status = 0 AND bl.fan_user_id = #{user.createById} |
|
|
|
u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{user.createById} |
|
|
|
<if test="user.nickName != null and user.nickName != ''"> |
|
|
|
<if test="user.nickName != null and user.nickName != ''"> |
|
|
|
AND u.nick_name LIKE CONCAT('%', #{user.nickName}, '%') |
|
|
|
AND u.nick_name LIKE CONCAT('%', #{user.nickName}, '%') |
|
|
|
</if> |
|
|
|
</if> |
|
|
@ -70,10 +70,9 @@ |
|
|
|
FROM |
|
|
|
FROM |
|
|
|
common_push_blacklist bl JOIN sys_user u |
|
|
|
common_push_blacklist bl JOIN sys_user u |
|
|
|
ON |
|
|
|
ON |
|
|
|
bl.concern_user_id = u.id |
|
|
|
bl.fan_user_id = u.id |
|
|
|
<where> |
|
|
|
<where> |
|
|
|
u.del_flag = 0 AND |
|
|
|
u.del_flag = 0 AND u.status = 0 AND |
|
|
|
u.status = 0 AND |
|
|
|
|
|
|
|
bl.concern_user_id = #{concernUserId} AND |
|
|
|
bl.concern_user_id = #{concernUserId} AND |
|
|
|
bl.fan_user_id = #{fanUserId} |
|
|
|
bl.fan_user_id = #{fanUserId} |
|
|
|
</where> |
|
|
|
</where> |
|
|
|