From c254aff68026139da9de2d7f09b122ba892b7b56 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 10:52:20 +0800
Subject: [PATCH] 加密

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 951f527..9c57580 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
@@ -30,6 +30,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -88,8 +89,10 @@
             String id = technicianSubscribeVO.getId();
             TechnicianSubscribe technicianSubscribe = this.getById(id);
             AppUser appUser = appUserClient.getAppUserById(technicianSubscribe.getAppUserId());
-            technicianSubscribeVO.setUserName(appUser.getName());
-            technicianSubscribeVO.setPhone(appUser.getPhone());
+            if(null != appUser){
+                technicianSubscribeVO.setUserName(appUser.getName());
+                technicianSubscribeVO.setPhone(appUser.getPhone());
+            }
             Integer serviceMode = technicianSubscribeVO.getServiceMode();
             if(1 == serviceMode){
                 UserAddress userAddress = JSON.parseObject(technicianSubscribeVO.getUserAddress(), UserAddress.class);
@@ -113,7 +116,14 @@
     }
     @Override
     public IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status) {
-        return technicianSubscribeMapper.getTechnicianSubscribeByUser(page, userId, status);
+        IPage<TechnicianSubscribeVO> technicianSubscribeByUser = technicianSubscribeMapper.getTechnicianSubscribeByUser(page, userId, status);
+        technicianSubscribeByUser.getRecords().forEach(technicianSubscribeVO -> {
+            UserAddress userAddress = JSON.parseObject(technicianSubscribeVO.getUserAddress(), UserAddress.class);
+            if (userAddress != null){
+                technicianSubscribeVO.setUserAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
+            }
+        });
+        return technicianSubscribeByUser;
     }
 
     @Override

--
Gitblit v1.7.1