diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index 46500170..4e5e835c 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -343,11 +343,11 @@ public class UserServiceImpl implements UserService { onlineUserService.kickOutForUsername(resources.getUsername()); } - if (!user.getUsername().equals(resources.getUsername())){ + if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null){ String username = companyService.findById(user.getCompanyId()) - .getCompanyName().concat(StrPool.COLON).concat(user.getUsername()); - user.setUsername(username.concat(resources.getUsername())); + .getCompanyName().concat(StrPool.COLON).concat(resources.getUsername()); + user.setUsername(username); } user.setEmail(resources.getEmail()); user.setEnabled(resources.getEnabled());