| | |
|---|
| | | @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime, |
|---|
| | | @RequestParam(value = "actityEndTime", required = false) Date actityEndTime) |
|---|
| | | { |
|---|
| | | if(StringUtils.isEmpty(acState)) |
|---|
| | | { |
|---|
| | | acState=null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | return R.ok(volunteerActivityService.queryList(pageNum, pageSize, name, acState,getUserId()+"", acType, actityBeginTime, actityEndTime)); |
|---|
| | | if(StringUtils.isEmpty(acType)) |
|---|
| | | { |
|---|
| | | acType=null; |
|---|
| | | } |
|---|
| | | return R.ok(volunteerActivityService.queryList(pageNum, pageSize, name, acState, acType,getUserId()+"", actityBeginTime, actityEndTime)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
