Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -1309,6 +1309,16 @@ public class TodoCenterManage {
                 .asc()
                 .list();
         if(CollUtil.isEmpty(tasks)){
+            //如果此子单位为空 那就直接再查下 他的其它任务
+            List<Task> currentTasks = taskService.createTaskQuery()
+                    .processInstanceId(instance.getId())
+                    .taskAssignee(employeeCode)
+                    .orderByTaskCreateTime()
+                    .asc()
+                    .list();
+            if(CollUtil.isNotEmpty(currentTasks)){
+                return currentTasks.get(0).getId();
+            }
             return taskId;
         }
         return tasks.get(0).getId();

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/config/RedisSessionTimeoutConfig.java → pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/config/SessionTimeoutConfig.java

@@ -21,9 +21,9 @@ import javax.annotation.PostConstruct;
 @Configuration
 @RequiredArgsConstructor
 @AutoConfigureAfter(RedisHttpSessionConfiguration.class)
-public class RedisSessionTimeoutConfig {
+public class SessionTimeoutConfig {
 
-    @Value("${spring.session.timeout:60 * 60 * 4}")
+    @Value("${spring.session.timeout:14400}")
     private Integer springSessionTimeout;
 
     private final RedisHttpSessionConfiguration redisHttpSessionConfiguration;