From 2e2e85889d73671cea70377b696c1dde29ac7306 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 21 Apr 2023 19:59:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=BB=91=E5=90=8D=E5=8D=95=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/PushBlacklistMapper.xml  |  4 ++--
 .../main/resources/mapper/PushConcernFanMapper.xml | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

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
     <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 @@
     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>
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
     <choose>
       <when test="map.dynamicJoinType == 1">
@@ -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 @@
     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 @@
       </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 @@
       <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>