提交修改

tall/src/main/java/com/ccsens/tall/service/InputDocService.java

@@ -59,7 +59,7 @@ public class InputDocService implements IInputDocService {
             longList.add(proMember.getProjectId());
         });
         SysProjectExample sysProjectExample=new SysProjectExample();
-        sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime());
+        sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getEndTime()).andEndTimeGreaterThanOrEqualTo(param.getStartTime());
         List<SysProject> sysProjects = sysProjectMapper.selectByExample(sysProjectExample);
         sysProjects.forEach(sysProject -> {
             LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo();
@@ -81,6 +81,7 @@ public class InputDocService implements IInputDocService {
         List<TaskVo.NormalTask> normalTaskList1= iInputDocDao.selectByCompany(param,userId);
         //给二级任务下添加子任务
         //遍历项目
+        if(param.getId()!=null){
             for (int i = 0; i < normalTaskList1.size(); i++) {
                 //遍历任务
                 for (int i1 = 0; i1 < normalTaskList1.get(i).getSecondTasks().size(); i1++) {
@@ -94,6 +95,7 @@ public class InputDocService implements IInputDocService {
                     }
                 }
             }
+        }
         //拆分后得全局任务和普通任务
         List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
         List<TaskVo.NormalTask> normalTaskList = new ArrayList<>();

tall/src/main/resources/application.yml

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