Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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<TaskVo.RemindInfo> remindInfoList = new ArrayList<>();
         if(ObjectUtil.isNotNull(addTask.getTaskRemind())){
@@ -767,13 +769,16 @@ public class TaskSubTimeService implements ITaskSubTimeService {
 
     @Override
     public List<TaskVo.RemindInfo> 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());

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common