From 3834fbc3cee6b825b09a37e0f751d671c452704c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 18:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 68827d0..3b4d4f5 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -124,8 +124,10 @@
}
for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
AppUser appUser = appUserClient.getAppUserById(technicianSubscribeVO.getAppUserId());
- technicianSubscribeVO.setUserName(appUser.getName());
- technicianSubscribeVO.setPhone(appUser.getPhone());
+ if(appUser!=null){
+ technicianSubscribeVO.setUserName(appUser.getName());
+ technicianSubscribeVO.setPhone(appUser.getPhone());
+ }
}
return pageInfo.setRecords(technicianSubscribeByUserAndShop1);
}
--
Gitblit v1.7.1