From a323bb6fbfdd9fa7bc03465b7fbed2baf6d0fa84 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 09:34:47 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 8114a0d..b26b0fa 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -185,8 +185,10 @@
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
- record.setAuthName(appUserById.getName());
- record.setAuthPhone(appUserById.getPhone());
+ if (appUserById!=null) {
+ record.setAuthName(appUserById.getName());
+ record.setAuthPhone(appUserById.getPhone());
+ }
}
if (record.getAddType() == 3) {
R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
--
Gitblit v1.7.1