Browse Source

fix: 黑名单限制无效

master
wangxiang 2 years ago
parent
commit
2e2e85889d
  1. 4
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml
  2. 14
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml

4
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
ON
bl.fan_user_id = u.id
<where>
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}
<if test="user.nickName != null and user.nickName != ''">
AND u.nick_name LIKE CONCAT('%', #{user.nickName}, '%')
</if>
@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
ON
bl.fan_user_id = u.id
<where>
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}
</where>

14
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml

@ -30,7 +30,7 @@ @@ -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
<choose>
<when test="map.dynamicJoinType == 1">
@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
</otherwise>
</choose>
<where>
cf.del_flag = 0 AND u.status = 0
cf.del_flag = 0
AND u.status = 0
<if test="map.status != null and map.status != ''">
AND cf.status = #{map.status}
</if>
@ -86,7 +87,7 @@ @@ -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
<choose>
<when test="dynamicJoinType == 1">
@ -97,7 +98,8 @@ @@ -97,7 +98,8 @@
</otherwise>
</choose>
<where>
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
</where>
@ -117,13 +119,13 @@ @@ -117,13 +119,13 @@
<when test="map.dynamicJoinType == 1">
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
</when>
<otherwise>
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
</otherwise>
</choose>

Loading…
Cancel
Save