From c274235e7e5e5261dd635b2b025b1f48c7e44600 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Mon, 1 Dec 2025 15:19:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=ED=87=B4=EA=B7=BC=EC=BD=98=EC=86=94?= =?UTF-8?q?=EC=97=90=20=EC=A1=B0=ED=98=84=ED=9D=AC=EC=A3=BC=EC=9E=84=20?= =?UTF-8?q?=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=20=ED=98=84=EC=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/itn/admin/commute/mapper/domain/UserEnum.java | 7 ++++--- .../itn/admin/commute/service/impl/CommuteServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java b/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java index 0d58c51..35ba618 100644 --- a/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java +++ b/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java @@ -17,11 +17,12 @@ public enum UserEnum { ,user9("&@~zO4oUG4dNtiVfnDdfCWM2A==","장영익", "실장") ,user10("&@~O+736xoPn0FzMuPQufff1w==","김상훈", "본부장") // ,user11("&@~E8RB3p27IfRVEhNefMu2Vw==","김보미", "대리") - ,user12("&@~47amAycYJ4ZT8BZDi6a2sA==","이설희", "주임") - ,user13("&@~KPBL+GIy7i2agV7V57MZWg==","정다은", "대리") +// ,user12("&@~47amAycYJ4ZT8BZDi6a2sA==","이설희", "주임") + ,user13("&@~tuIqQtGVVzz6rRunF/jHUQ==","정다은", "대리") + ,user14("&@~KPBL+GIy7i2agV7V57MZWg==","조현희", "주임") ,user15("&@~S6vaRrMJmeRjp0T8z+/ybg==","강민경", "팀장") ,user16("&@~7mpJXFU+euFUNEdHmHLQVQ==","정수빈", "대리") - ,user17("&@~+BL2FKvmIQc/jIyHvz0jew==","박은지", "주임") +// ,user17("&@~+BL2FKvmIQc/jIyHvz0jew==","박은지", "주임") // ,user18("&@~l+Zs/I7piSIFu9WBQaI1eg==","박세희R", "알바") diff --git a/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java b/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java index f53f05b..98964f9 100644 --- a/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java +++ b/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java @@ -102,6 +102,7 @@ public class CommuteServiceImpl implements CommuteService { t.setLastActivityTimeMemo(this.getLeaveWorkEarly(t.getLastActivityTime())); + if(StringUtils.isNotEmpty(t.getUsrid())){ UserVO matchedUser = userAllVO.stream() .filter(user -> user.getBiostarId().equals(t.getUsrid()))