diff --git a/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java b/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java index 3925cb5..322f46f 100644 --- a/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java +++ b/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java @@ -41,11 +41,6 @@ public class OnlineUserDto { */ private String nickName; - /** - * 用户姓名 - */ - private String person_name; - /** * 岗位 */ diff --git a/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java b/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java index 2e65f58..14b5816 100644 --- a/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java +++ b/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java @@ -84,12 +84,12 @@ public class EasBillSchedule { //@Scheduled(cron = "0/120 * * * * *") public void insertUsers(List existingUsers, List newUsers) { Set ids = existingUsers.stream().map(SysUser::getUsername).collect(Collectors.toSet()); - // 过滤出需要插入的新用户,并设置默认属性 List insertUsers = newUsers.stream() .filter(user -> !ids.contains(user.getUsername())) .peek(user -> { - user.setIs_used(true); // 设置默认启用 - user.setCreate_time(new Date()); // 设置创建时间 + //默认启用 + user.setIs_used(true); + user.setCreate_time(new Date()); }) .collect(Collectors.toList());