Merge remote-tracking branch 'origin/master'

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

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -181,15 +182,15 @@ public class TodoCenterManage {
         List<ProcessTaskVo> todoList = processTaskService.getUserTodoList(req);
         //有退回待办的
         List<ProcessTaskVo> backList = processTaskService.getBackTodoList(req);
-        todoList.addAll(backList);
-        todoList.stream().sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime).reversed());
 
-        if (CollUtil.isEmpty(todoList)) {
+        List<ProcessTaskVo> list = Stream.concat(todoList.stream(),backList.stream()).collect(Collectors.toList());
+        list.stream().filter(Objects::nonNull).sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime).reversed());
+
+        if (CollUtil.isEmpty(list)) {
             return PageVo.empty();
         }
 
-        todoList = todoList.stream().filter(Objects::nonNull).collect(Collectors.toList());
-        List<ProcessTaskVo> userTodoList = todoList.stream()
+        List<ProcessTaskVo> userTodoList = list.stream()
                 .skip((long) (pageNumber - 1) * pageSize)
                 .limit(pageSize)
                 .collect(Collectors.toList());

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -408,5 +408,4 @@ public class UserInfoManage {
         }
         return resUserDetailVO;
     }
-
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java

@@ -65,6 +65,9 @@ public class UserInfoServiceImpl extends ServiceImpl<NdUserInfoMapper, UserInfo>
 
     @Override
     public Map<String, ProcessInstanceUserDto> getUserMapByEmployeeCode(Set<String> staterUsers) {
+        if(CollUtil.isEmpty(staterUsers)){
+            return Collections.emptyMap();
+        }
         List<UserInfo> userInfos = userInfoMapper.selectList(Wrappers.lambdaQuery(UserInfo.class)
                 .in(UserInfo::getEmployeeCode,staterUsers));
         if(CollUtil.isEmpty(userInfos)){