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));