diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java index 93ee845..46d8f67 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java @@ -86,15 +86,22 @@ public class TodoTaskServiceImpl implements TodoTaskService { String currentProcessor = todoTaskPojo.getCurrentProcessor(); BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1); - List strings = JSON.parseArray(currentProcessor).toList(String.class).stream() - .map(x -> { - XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x); - if (ObjectUtils.isNotEmpty(xdapUsers)) { - return xdapUsers.getUsername(); - } else { - return "未知用户名:" + x; - } - }).collect(Collectors.toList()); + List strings = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(currentProcessor)) { + try { + strings = JSON.parseArray(currentProcessor).toList(String.class).stream() + .map(x -> { + XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x); + if (ObjectUtils.isNotEmpty(xdapUsers)) { + return xdapUsers.getUsername(); + } else { + return "未知用户名:" + x; + } + }).collect(Collectors.toList()); + } catch (Exception e) { + strings = Arrays.asList(currentProcessor); + } + } todoTaskPojo1.setCurrentProcessor(String.join(",", strings)); tods.add(todoTaskPojo1); } @@ -153,19 +160,21 @@ public class TodoTaskServiceImpl implements TodoTaskService { String currentProcessor = todoTaskPojo.getCurrentProcessor(); BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1); - List strings = null; - try { - strings = JSON.parseArray(currentProcessor).toList(String.class).stream() - .map(x -> { - XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x); - if (ObjectUtils.isNotEmpty(xdapUsers)) { - return xdapUsers.getUsername(); - } else { - return "未知用户名:" + x; - } - }).collect(Collectors.toList()); - } catch (Exception e) { - strings = Arrays.asList("解析失败 未知用户名:" + currentProcessor); + List strings = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(currentProcessor)) { + try { + strings = JSON.parseArray(currentProcessor).toList(String.class).stream() + .map(x -> { + XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x); + if (ObjectUtils.isNotEmpty(xdapUsers)) { + return xdapUsers.getUsername(); + } else { + return "未知用户名:" + x; + } + }).collect(Collectors.toList()); + } catch (Exception e) { + strings = Arrays.asList(currentProcessor); + } } todoTaskPojo1.setCurrentProcessor(String.join(",", strings)); tods.add(todoTaskPojo1);