From 06374f9283b0b346d343a2b108fe9cbe74334716 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Jun 2022 16:48:05 +0800
Subject: [PATCH] serviceShowName

---
 .../service/impl/IcUserDemandRecServiceImpl.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 62d90ee33e..ffb3b10869 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
@@ -335,7 +335,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                  //待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
                 res.setStatusName(statusMap.containsKey(res.getStatus())?statusMap.get(res.getStatus()):StrConstant.EPMETY_STR);
                  //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
-                res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR);
+                if (serviceTypeMap.containsKey(res.getServiceType())) {
+                    res.setServiceShowName(res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"));
+                } else if (res.getServiceType().equals(UserDemandConstant.VOLUNTEER)) {
+                    res.setServiceShowName(res.getServiceName().concat("(").concat("志愿者").concat(")"));
+                }
                 res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId()) ? true : false);
             }
         }
@@ -691,7 +695,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             res.setStatusName(statusMap.containsKey(res.getStatus()) ? statusMap.get(res.getStatus()) : StrConstant.EPMETY_STR);
 
             //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
-            res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR);
+            if (serviceTypeMap.containsKey(res.getServiceType())) {
+                res.setServiceShowName(res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"));
+            } else if (res.getServiceType().equals(UserDemandConstant.VOLUNTEER)) {
+                res.setServiceShowName(res.getServiceName().concat("(").concat("志愿者").concat(")"));
+            }
             res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId()));
         }
         return res;