From 175dfd01ef70606611c2fcec29c844108ebe4531 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Tue, 11 Mar 2025 08:52:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E8=AE=BE=E7=BD=AE=E7=AE=A1=E8=BE=96=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=E5=92=8C=E5=8C=BB=E7=94=9F=E7=9A=84=20=E4=B8=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/service/impl/MzsyUserInfoSyncServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java b/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java index a31dca6..05ff0a0 100644 --- a/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java +++ b/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java @@ -98,9 +98,9 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService { for (PowerUser iuPowerUser : iuPowerUserList) { if (existsPowerUserMap.containsKey(iuPowerUser.getUserName())) { PowerUser powerUser = existsPowerUserMap.get(iuPowerUser.getUserName()); - // 如果修改的管辖科室不为空，获取原来的，加上现在的，得到最新的，下面管辖医生同理 + // 如果修改的管辖科室不为空,并且原来的管辖科室也不为空，获取原来的，加上现在的，得到最新的，下面管辖医生同理 String powerDept = powerUser.getPowerDept(); - if (Func.isNotBlank(iuPowerUser.getPowerDept())) { + if (Func.isNotBlank(iuPowerUser.getPowerDept()) && Func.isNotBlank(powerDept)) { HashSet powerDepts = new HashSet<>(); if (Func.isNotBlank(powerDept)) { Collections.addAll(powerDepts, powerDept.split(delimiter)); @@ -109,7 +109,7 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService { powerDept = String.join(delimiter, powerDepts); } String powerAttending = powerUser.getPowerAttending(); - if (Func.isNotBlank(iuPowerUser.getPowerAttending())) { + if (Func.isNotBlank(iuPowerUser.getPowerAttending()) && Func.isNotBlank(powerAttending)) { HashSet powerAttendings = new HashSet<>(); if (Func.isNotBlank(powerAttending)) { Collections.addAll(powerAttendings, powerAttending.split(delimiter));