From 9688bdf8e8db38daea09f1ea0484e752d9e2e757 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 4 Jun 2024 10:54:52 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/system/service/user/dto/OnlineUserDto.java | 5 ----- .../src/main/java/org/nl/wms/schedule/EasBillSchedule.java | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) 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());