diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml index 76f7e003..6a82564c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml @@ -33,7 +33,7 @@ ON bl.fan_user_id = u.id - u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{user.createById} + bl.del_flag = 0 AND u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{user.createById} AND u.nick_name LIKE CONCAT('%', #{user.nickName}, '%') @@ -72,7 +72,7 @@ ON bl.fan_user_id = u.id - u.del_flag = 0 AND u.status = 0 AND + bl.del_flag = 0 AND u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{concernUserId} AND bl.fan_user_id = #{fanUserId} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml index df630a42..aa88b761 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml @@ -30,7 +30,7 @@ u.update_time, u.remarks FROM - common_push_concern_fan cf JOIN sys_user u + common_push_concern_fan cf JOIN (SELECT * FROM sys_user WHERE del_flag = 0) u ON @@ -41,7 +41,8 @@ - cf.del_flag = 0 AND u.status = 0 + cf.del_flag = 0 + AND u.status = 0 AND cf.status = #{map.status} @@ -86,7 +87,7 @@ u.update_time, u.remarks FROM - common_push_concern_fan cf JOIN sys_user u + common_push_concern_fan cf JOIN (SELECT * FROM sys_user WHERE del_flag = 0) u ON @@ -97,7 +98,8 @@ - cf.del_flag = 0 AND u.status = 0 + cf.del_flag = 0 + AND u.status = 0 AND cf.id = #{id} ORDER BY u.create_time ASC @@ -117,13 +119,13 @@ AND concern_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf ON u.id = cf.fan_user_id - LEFT JOIN common_push_blacklist b + LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b ON u.id = b.fan_user_id AND fan_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf ON u.id = cf.concern_user_id - LEFT JOIN common_push_blacklist b + LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b ON u.id = b.concern_user_id