修改bug

master
bynt 2 years ago
parent 5d7580e1e0
commit 05d78e1a0d

@ -235,9 +235,9 @@ public class UserServiceImpl implements UserService {
public Map<Long, String> queryName(Set<Long> userIds) {
Map<Long, String> map = new HashMap<>();
List<User> userList = userRepository.findAllById(userIds);
if (CollUtil.isNotEmpty(userList)){
if (CollUtil.isNotEmpty(userList)) {
for (User user : userList) {
map.put(user.getId(),user.getUsername());
map.put(user.getId(), user.getUsername());
}
}
return map;
@ -353,12 +353,13 @@ public class UserServiceImpl implements UserService {
onlineUserService.kickOutForUsername(resources.getUsername());
}
if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null){
if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) {
String username =
companyService.findById(user.getCompanyId())
.getCompanyName().trim().concat(StrPool.COLON).concat(resources.getUsername());
user.setUsername(username);
}
user.setIsReview(resources.getIsReview());
user.setEmail(resources.getEmail());
user.setEnabled(resources.getEnabled());
user.setRoles(resources.getRoles());

@ -169,4 +169,4 @@ debt:
visitUrl: https://a.z48.cn/pages/login#/pages/statisticsForm/index?userId=
qrcodeUrl: /home/eladmin/qrcode/
qrcodeLogo: /home/eladmin/qrcode/qrcode.jpg
reqUrl: /qrcode/
reqUrl: /qrcode/

Loading…
Cancel
Save