|
@@ -153,6 +153,12 @@ public class VolunteerWorkDateServiceImpl extends ServiceImpl<VolunteerWorkDateM
|
|
|
public R<List<VolunteerWorkDate>> getWorkDateAndTime() {
|
|
|
// 获取当前用户信息
|
|
|
Long userId = SecurityUtils.getUserId();
|
|
|
+ //判断当前用户是否已经注册了志愿者
|
|
|
+ List<VolunteerInfo> infos = volunteerInfoService.list(new LambdaQueryWrapper<VolunteerInfo>()
|
|
|
+ .eq(VolunteerInfo::getVolunteerId, userId));
|
|
|
+ if (CollectionUtil.isEmpty(infos)){
|
|
|
+ return R.fail("您还未注册为志愿者,请先注册");
|
|
|
+ }
|
|
|
List<VolunteerWorkDate> list = this.list(new LambdaQueryWrapper<VolunteerWorkDate>()
|
|
|
.eq(VolunteerWorkDate::getVolunteerId, userId)
|
|
|
.ge(VolunteerWorkDate::getWorkDate, LocalDate.now()));
|