From f8444fb1812f78845083f6c03e80e62ebea10c19 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 27 Dec 2023 15:44:33 +0800
Subject: [PATCH] fix: cas_user_id

---
 .../resources/mapper/PushBlacklistMapper.xml   |  4 ++--
 .../resources/mapper/PushConcernFanMapper.xml  | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 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 de94faad..42d831cc 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
@@ -30,7 +30,7 @@
     csu.remarks
     from
     common_push_blacklist bl
-    join sys_user u on bl.fan_user_id = u.cas_user_id
+    join sys_user u on bl.fan_user_id = u.id
     join cas_sso_user_view csu on u.cas_user_id = csu.id
     <where>
       bl.del_flag = 0 AND u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{map.createById}
@@ -69,7 +69,7 @@
     csu.remarks
     from
     common_push_blacklist bl
-    join sys_user u on bl.fan_user_id = u.cas_user_id
+    join sys_user u on bl.fan_user_id = u.id
     join cas_sso_user_view csu on u.cas_user_id = csu.id
     <where>
       bl.del_flag = 0 AND u.del_flag = 0 AND u.status = 0 AND
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 632c0330..4eecf963 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
@@ -34,10 +34,10 @@
     ON
     <choose>
       <when test="map.dynamicJoinType == 1">
-        cf.concern_user_id = u.cas_user_id
+        cf.concern_user_id = u.id
       </when>
       <otherwise>
-        cf.fan_user_id = u.cas_user_id
+        cf.fan_user_id = u.id
       </otherwise>
     </choose>
     JOIN (SELECT * FROM cas_sso_user_view WHERE del_flag = 0) csu ON u.cas_user_id = csu.id
@@ -92,10 +92,10 @@
     ON
     <choose>
       <when test="dynamicJoinType == 1">
-        cf.concern_user_id = u.cas_user_id
+        cf.concern_user_id = u.id
       </when>
       <otherwise>
-        cf.fan_user_id = u.cas_user_id
+        cf.fan_user_id = u.id
       </otherwise>
     </choose>
     JOIN (SELECT * FROM cas_sso_user_view WHERE del_flag = 0) csu ON u.cas_user_id = csu.id
@@ -145,15 +145,15 @@
       <!--企业用户进行粉丝查询连表-->
       <when test="map.dynamicJoinType == 1">
         AND concern_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf
-        ON u.cas_user_id = cf.fan_user_id
+        ON u.id = cf.fan_user_id
         LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b
-        ON u.cas_user_id = b.concern_user_id
+        ON u.id = b.concern_user_id
       </when>
       <otherwise>
         AND fan_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf
-        ON u.cas_user_id = cf.concern_user_id
+        ON u.id = cf.concern_user_id
         LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b
-        ON u.cas_user_id = b.fan_user_id
+        ON u.id = b.fan_user_id
       </otherwise>
     </choose>
     JOIN (SELECT * FROM cas_sso_user_view WHERE del_flag = 0) csu ON u.cas_user_id = csu.id
@@ -163,7 +163,7 @@
       AND u.user_type not in(
         ${@com.cloud.kicc.system.api.enums.UserTypeEnum@INTERNAL_USER.value}
       )
-      AND u.cas_user_id != ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}
+      AND u.id != ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}
       <if test="map.nickName != null and map.nickName != ''">
         AND csu.nick_name = #{map.nickName}
       </if>