志愿认证审核

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);
     }
 

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