|
|
|
@ -15,12 +15,15 @@
|
|
|
|
|
*/
|
|
|
|
|
package com.baiye.modules.system.service.impl;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
|
import com.baiye.exception.EntityExistException;
|
|
|
|
|
import com.baiye.exception.EntityNotFoundException;
|
|
|
|
|
import com.baiye.modules.security.service.OnlineUserService;
|
|
|
|
|
import com.baiye.modules.security.service.UserCacheClean;
|
|
|
|
|
import com.baiye.modules.system.domain.Role;
|
|
|
|
|
import com.baiye.modules.system.domain.User;
|
|
|
|
|
import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
@ -169,12 +172,22 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public UserDto findByName(String userName) {
|
|
|
|
|
UserDto convert;
|
|
|
|
|
User user = userRepository.findByUsername(userName);
|
|
|
|
|
if (user == null) {
|
|
|
|
|
throw new EntityNotFoundException(User.class, "name", userName);
|
|
|
|
|
} else {
|
|
|
|
|
return userMapper.toDto(user);
|
|
|
|
|
convert = Convert.convert(UserDto.class, user);
|
|
|
|
|
Set<Role> roles = user.getRoles();
|
|
|
|
|
convert.setIsManager(Boolean.FALSE);
|
|
|
|
|
for (Role role : roles) {
|
|
|
|
|
// TODO 修改管理员id
|
|
|
|
|
if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
|
|
|
|
|
convert.setIsManager(Boolean.TRUE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return convert;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|