修改昵称

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