|
@ -98,6 +98,7 @@ public class IcUserDemandRecController implements ResultDataResolver { |
|
|
formDTO.setStaffId(tokenDto.getUserId()); |
|
|
formDTO.setStaffId(tokenDto.getUserId()); |
|
|
ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class); |
|
|
ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class); |
|
|
if (UserDemandConstant.VOLUNTEER.equals(formDTO.getServiceType())) { |
|
|
if (UserDemandConstant.VOLUNTEER.equals(formDTO.getServiceType())) { |
|
|
|
|
|
//应该查询爱心互助的志愿者
|
|
|
return new Result<List<OptionDTO>>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(), formDTO.getStaffId(),formDTO.getServiceName())); |
|
|
return new Result<List<OptionDTO>>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(), formDTO.getStaffId(),formDTO.getServiceName())); |
|
|
} else if (UserDemandConstant.SOCIAL_ORG.equals(formDTO.getServiceType())) { |
|
|
} else if (UserDemandConstant.SOCIAL_ORG.equals(formDTO.getServiceType())) { |
|
|
ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class, ServiceQueryFormDTO.SocietyOrgInternalGroup.class); |
|
|
ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class, ServiceQueryFormDTO.SocietyOrgInternalGroup.class); |
|
@ -106,6 +107,8 @@ public class IcUserDemandRecController implements ResultDataResolver { |
|
|
return new Result<List<OptionDTO>>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO)); |
|
|
return new Result<List<OptionDTO>>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO)); |
|
|
} else if (UserDemandConstant.PARTY_UNIT.equals(formDTO.getServiceType())) { |
|
|
} else if (UserDemandConstant.PARTY_UNIT.equals(formDTO.getServiceType())) { |
|
|
return new Result<List<OptionDTO>>().ok(icPartyUnitService.queryServiceList(formDTO)); |
|
|
return new Result<List<OptionDTO>>().ok(icPartyUnitService.queryServiceList(formDTO)); |
|
|
|
|
|
}else if (UserDemandConstant.IC_USER_VOLUNTEER.equals(formDTO.getServiceType())) { |
|
|
|
|
|
return new Result<List<OptionDTO>>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(), formDTO.getStaffId(),formDTO.getServiceName())); |
|
|
} |
|
|
} |
|
|
return new Result<>(); |
|
|
return new Result<>(); |
|
|
} |
|
|
} |
|
|