From aadad5c00c836daed57c5295c292224a398b7974 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 30 Aug 2021 16:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=AE=A4=E8=AF=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/service/impl/VolunteerServiceImpl.java  | 4 +++-
 .../src/main/resources/mapper/volunteer/VolunteerDao.xml      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java
index dbfacc7..4edf6fb 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java
@@ -115,7 +115,9 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
     @Override
     public Result getVolunteerDetail(AppVolunteerApplyDTO formDto) {
         AppVolunteerDetailDTO result = baseDao.selectAppDetailById(formDto.getUserId());
-        result.setVolunteerOrgIds(volunteerOrgRelationDao.selectOrgIdByVolunteerId(result.getId()));
+        if(result != null){
+            result.setVolunteerOrgIds(volunteerOrgRelationDao.selectOrgIdByVolunteerId(result.getId()));
+        }
         return new Result().ok(result);
     }
 
diff --git a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml
index 244e549..3d7d4a6 100644
--- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml
+++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml
@@ -96,7 +96,7 @@
 			 WHEN V.STATE='0' THEN '未审核'
 			 WHEN V.STATE='5' THEN '未通过'
 			 WHEN V.STATE='10' THEN '通过'
-			 else '状态信息错误' END as stateName,
+			 else null END as stateName,
              v.REASON,
 			 REPLACE(GROUP_CONCAT(o.volunteer_org_name ORDER BY o.create_date DESC),',','、')  as volunteerOrgNames
         from epdc_volunteer v