From 34b48a1cc42d2a5b622523e5f0666450952ee425 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 28 Dec 2021 14:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=9C=80=E6=B1=82=E8=A2=AB?=
 =?UTF-8?q?=E6=8C=87=E6=B4=BE=E3=80=82=E5=BA=94=E8=AF=A5=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=88=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcUserDemandRecServiceImpl.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index b194d61dc2..a15b3cde39 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -1428,6 +1428,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         } else if (UserDemandConstant.COMMUNITY_ORG.equals(serviceType)) {
             Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap = getCommunityOrgMap(Arrays.asList(serverId));
             serviceName = MapUtils.isNotEmpty(communityOrgMap) ? communityOrgMap.get(serverId).getOrganizationName() : StrConstant.EPMETY_STR;
+        }else if(UserDemandConstant.VOLUNTEER.equals(serviceType)){
+            //如果指派给了志愿者-》您提出的需求将由XX为您解决，请查看
+            UserResiInfoListFormDTO userResiInfoListFormDTO=new UserResiInfoListFormDTO();
+            userResiInfoListFormDTO.setUserIdList(Arrays.asList(serverId));
+            Result<List<UserResiInfoResultDTO>> userRes = epmetUserOpenFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
+            if(userRes.success()){
+                serviceName=userRes.getData().get(NumConstant.ZERO).getRealName();
+            }
         }
         if (StringUtils.isNotBlank(serviceName)) {
             UserMessageFormDTO userMessage = new UserMessageFormDTO();