diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java index 7801cbf1..71fa9283 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java @@ -509,9 +509,11 @@ public class TaskSubTimeService implements ITaskSubTimeService { } //获取符合当前时间的subtimeId Long subTimeId = taskDetailDao.selectSubTimeByTaskIdAndTime(detail.getId(), System.currentTimeMillis()); + log.info("获取符合当前时间的subtimeId:{}",subTimeId); if (ObjectUtil.isNull(subTimeId) && CollectionUtil.isNotEmpty(proTaskSubTimeList)) { subTimeId = proTaskSubTimeList.get(0).getId(); } + log.info("subtimeId:{}",subTimeId); //添加任务提醒 List remindInfoList = new ArrayList<>(); if(ObjectUtil.isNotNull(addTask.getTaskRemind())){ @@ -767,13 +769,16 @@ public class TaskSubTimeService implements ITaskSubTimeService { @Override public List saveRemind(Long userId,TaskDto.TaskRemind taskRemind) { + log.info("提醒信息:{}",taskRemind); ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(taskRemind.getTaskId()); if(ObjectUtil.isNull(proTaskSubTime)){ - throw new BaseException(CodeEnum.NOT_TASK); +// throw new BaseException(CodeEnum.NOT_TASK); + return null; } ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId()); if(ObjectUtil.isNull(proTaskDetail)){ - throw new BaseException(CodeEnum.NOT_TASK); +// throw new BaseException(CodeEnum.NOT_TASK); + return null; } // //判断用户是否是任务的负责人 // ProRole role = proRoleDao.selectByPrimaryKey(proTaskDetail.getExecutorRole()); diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common