refactor: 重构黑名单模块

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java

@@ -1,5 +1,6 @@
 package com.cloud.kicc.commonbiz.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.CommonEntity;
 import java.io.Serializable;
@@ -26,6 +27,9 @@ public class PushBlacklist implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
+    private String id;
+
     @ApiModelProperty("关注用户")
     private String concernUserId;
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java

@@ -19,11 +19,8 @@ import java.util.Map;
  */
 public interface PushBlacklistMapper extends BaseMapper<PushBlacklist> {
 
-    @MapKey("concernUserId")
     IPage<Map<String, Object>> selectPushBlacklist(@Param("page") IPage<Map<String, Object>> page, @Param("user") User user);
 
-    @MapKey("concernUserId")
     Map<String, Object> getByPushBlacklistId(PushBlacklist pushBlacklist);
 
-
 }

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

@@ -4,6 +4,7 @@
 
   <select id="selectPushBlacklist" resultType="Map">
     SELECT
+    bl.id,
     bl.concern_user_id,
     bl.fan_user_id,
     u.user_name,
@@ -32,13 +33,14 @@
     <where>
       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 = #{user.nickName}
+        AND u.nick_name LIKE CONCAT('%', #{user.nickName}, '%')
       </if>
     </where>
   </select>
 
   <select id="getByPushBlacklistId" resultType="Map">
     SELECT
+    bl.id,
     bl.concern_user_id,
     bl.fan_user_id,
     u.user_name,
@@ -65,7 +67,7 @@
     ON
     bl.fan_user_id = u.id
     <where>
-      u.del_flag = 0 AND u.status = 0
+      u.del_flag = 0 AND u.status = 0 AND
       bl.concern_user_id = #{concernUserId} AND bl.fan_user_id = #{fanUserId}
     </where>
   </select>