From 1d33dff032826908694d03a0050227125b39739b Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Tue, 28 Mar 2023 15:49:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E9=BB=91?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java  | 4 ++++
 .../cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java    | 3 ---
 .../src/main/resources/mapper/PushBlacklistMapper.xml       | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java
index ee9c918f..27a9990e 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java
+++ b/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;
 
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java
index 721249e6..a7a7899e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java
+++ b/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);
 
-
 }
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 711e37e5..a7c0c651 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
@@ -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>