diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
index 39d205bdca..be5daf5e3e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
@@ -161,7 +161,7 @@ public class ResiDemandController {
      * @return
      */
     @PostMapping("mydemand")
-    public Result<List<ResiClientMyDemandResDTO>> queryMyDemand(@LoginUser TokenDto tokenDto, @RequestBody ResiClientMyDemandFormDTO formDTO){
+    public Result<List<ResiClientMyDemandResDTO>> queryMyDemand(@LoginUser TokenDto tokenDto,@RequestBody ResiClientMyDemandFormDTO formDTO){
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO,PageFormDTO.AddUserInternalGroup.class,ResiClientMyDemandFormDTO.AddUserInternalGroup.class);
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 3ef872f211..8c3ade3df5 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
@@ -266,7 +266,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //3、查询志愿者
             // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
             Map<String,String> userInfoMap=new HashMap<>();
-            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
+            Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
             if(CollectionUtils.isNotEmpty(userIdList)){
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList));
                 if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){
@@ -734,7 +734,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //3、查询志愿者
             // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
             Map<String,String> userInfoMap=new HashMap<>();
-            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
+            Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
             if(CollectionUtils.isNotEmpty(userIdList)){
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList));
                 if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){
@@ -1091,48 +1091,50 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         List<ResiClientMyDemandResDTO> list=result.getList();
         if (CollectionUtils.isNotEmpty(list)) {
             //1、服务方（社会组织、社区自组织、区域化党建单位）单位名称，负责人姓名，负责人手机号
-            List<String> partyUnitIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.PARTY_UNIT)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
+            List<String> partyUnitIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.PARTY_UNIT)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
             Map<String, IcPartyUnitEntity> partyUnitMap =getPartyUnitMap(partyUnitIds);
 
-            List<String> socialOrgIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.SOCIAL_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
+            List<String> socialOrgIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.SOCIAL_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
             Map<String, IcSocietyOrgEntity> socialOrgMap=getSocialOrgMap(socialOrgIds);
 
-            List<String> communityOrgIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.COMMUNITY_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
+            List<String> communityOrgIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.COMMUNITY_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
             Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap=getCommunityOrgMap(communityOrgIds);
 
             //2、志愿者姓名、手机号
-            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet());
+            Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet());
             Map<String,UserBaseInfoResultDTO> userInfoMap=getVolunteerMap(userIdList);
 
             for (ResiClientMyDemandResDTO resDto : list) {
                 //3、查询分类名称
                 IcResiDemandDictEntity demandDict = demandDictService.getByCode(formDTO.getCustomerId(), resDto.getCategoryCode());
                 resDto.setCategoryName(null != demandDict ? demandDict.getCategoryName() : StrConstant.EPMETY_STR);
-                switch (resDto.getServiceType())
-                {
-                    case UserDemandConstant.PARTY_UNIT:
-                        resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
-                        resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
-                        resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
-                        break;
-                    case UserDemandConstant.SOCIAL_ORG:
-                        resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
-                        resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
-                        resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
-                        break;
-                    case UserDemandConstant.COMMUNITY_ORG:
-                        resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
-                        resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
-                        resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
-                        break;
-                    case UserDemandConstant.VOLUNTEER:
-                        resDto.setServiceUnitName(StrConstant.EPMETY_STR);
-                        resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
-                        resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
-                        break;
-                    default:
-                        log.warn("serviceType 错误");
-                        break;
+                if(StringUtils.isNotBlank(resDto.getServiceType())){
+                    switch (resDto.getServiceType())
+                    {
+                        case UserDemandConstant.PARTY_UNIT:
+                            resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
+                            resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
+                            resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
+                            break;
+                        case UserDemandConstant.SOCIAL_ORG:
+                            resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
+                            resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
+                            resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
+                            break;
+                        case UserDemandConstant.COMMUNITY_ORG:
+                            resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
+                            resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
+                            resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
+                            break;
+                        case UserDemandConstant.VOLUNTEER:
+                            resDto.setServiceUnitName(StrConstant.EPMETY_STR);
+                            resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
+                            resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
+                            break;
+                        default:
+                            log.warn("serviceType 错误");
+                            break;
+                    }
                 }
             }
         }
@@ -1208,34 +1210,36 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             }
             //2、志愿者（姓名、手机号
             //3、区域化党建单位、社会组织、社区自组织 设置负责人和手机
-            switch (resDto.getServiceType()) {
-                case UserDemandConstant.PARTY_UNIT:
-                    Map<String, IcPartyUnitEntity> partyUnitMap = getPartyUnitMap(Arrays.asList(resDto.getServerId()));
-                    resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
-                    resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
-                    resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
-                    break;
-                case UserDemandConstant.SOCIAL_ORG:
-                    Map<String, IcSocietyOrgEntity> socialOrgMap = getSocialOrgMap(Arrays.asList(resDto.getServerId()));
-                    resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
-                    resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
-                    resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
-                    break;
-                case UserDemandConstant.COMMUNITY_ORG:
-                    Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap = getCommunityOrgMap(Arrays.asList(resDto.getServerId()));
-                    resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
-                    resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
-                    resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
-                    break;
-                case UserDemandConstant.VOLUNTEER:
-                    Map<String, UserBaseInfoResultDTO> userInfoMap = getVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId())));
-                    resDto.setServiceUnitName(StrConstant.EPMETY_STR);
-                    resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
-                    resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
-                    break;
-                default:
-                    log.warn("serviceType 错误");
-                    break;
+            if(StringUtils.isNotBlank(resDto.getServiceType())){
+                switch (resDto.getServiceType()) {
+                    case UserDemandConstant.PARTY_UNIT:
+                        Map<String, IcPartyUnitEntity> partyUnitMap = getPartyUnitMap(Arrays.asList(resDto.getServerId()));
+                        resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
+                        resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
+                        resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
+                        break;
+                    case UserDemandConstant.SOCIAL_ORG:
+                        Map<String, IcSocietyOrgEntity> socialOrgMap = getSocialOrgMap(Arrays.asList(resDto.getServerId()));
+                        resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
+                        resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
+                        resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
+                        break;
+                    case UserDemandConstant.COMMUNITY_ORG:
+                        Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap = getCommunityOrgMap(Arrays.asList(resDto.getServerId()));
+                        resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
+                        resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
+                        resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
+                        break;
+                    case UserDemandConstant.VOLUNTEER:
+                        Map<String, UserBaseInfoResultDTO> userInfoMap = getVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId())));
+                        resDto.setServiceUnitName(StrConstant.EPMETY_STR);
+                        resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
+                        resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
+                        break;
+                    default:
+                        log.warn("serviceType 错误");
+                        break;
+                }
             }
             return resDto;
         }