From ff1b8dfc2083b7b6682085c335cfa8923fc258e5 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sat, 1 Apr 2023 14:21:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PushApplicationServiceImpl.java     | 12 ++++++++++++
 .../cloud/kicc/system/controller/UserController.java |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
index 571400d9..144c3fc5 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
@@ -7,11 +7,15 @@ import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.commonbiz.api.entity.*;
 import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper;
 import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
+import com.cloud.kicc.system.api.entity.User;
+import com.cloud.kicc.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Service;
@@ -44,6 +48,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
     private final IPushBlacklistService iPushBlacklistService;
     private final IPushChatMessageService iPushChatMessageService;
     private final IPushConcernFanTypeService iPushConcernFanTypeService;
+    private final RemoteUserService remoteUserService;
 
     @Override
     public void enterpriseMessageSend(PushChatMessage pushChatMessage) {
@@ -51,6 +56,13 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
         if (StrUtil.isBlank(pushChatMessage.getUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) {
             throw new CheckedException("当前推送方用户ID与推送应用密钥必填!");
         }
+
+        R<User> result = remoteUserService.selectByUserId(pushChatMessage.getPushTypeId(), SecurityConstants.FROM_IN);
+        if (result == null || result.getData() == null) {
+            throw new CheckedException("用户不存在");
+        }
+        pushChatMessage.setTenantId(result.getData().getTenantId());
+
         PushApplication pushApplication = baseMapper.selectOne(Wrappers.<PushApplication>lambdaQuery()
                 .eq(PushApplication::getMessageSecret, pushChatMessage.getMessageSecret())
                         .eq(PushApplication::getCreateById, pushChatMessage.getUserId())
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
index 14e6f9a4..1465c663 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
@@ -101,7 +101,10 @@ public class UserController {
     @GetMapping("getUser/{id:\\w+}")
     public R getUser(@PathVariable("id") String id) {
         User user = userService.getById(id);
-        return R.ok(user);
+        if (user == null) {
+            return R.error(String.format("用户信息%s为空,请检查当前多租户下是否有当前用户信息!", id));
+        }
+        return R.ok(userService.getUserAuthority(user));
     }
 
     @SysLog("用户新增")