|
|
@ -32,6 +32,8 @@ import com.baiye.model.dto.UserDto;
|
|
|
|
import com.baiye.model.dto.UserFavorOfExcel;
|
|
|
|
import com.baiye.model.dto.UserFavorOfExcel;
|
|
|
|
import com.baiye.modules.security.service.OnlineUserService;
|
|
|
|
import com.baiye.modules.security.service.OnlineUserService;
|
|
|
|
import com.baiye.modules.system.domain.Company;
|
|
|
|
import com.baiye.modules.system.domain.Company;
|
|
|
|
|
|
|
|
import com.baiye.modules.system.domain.OrganizeUser;
|
|
|
|
|
|
|
|
import com.baiye.modules.system.repository.OrganizeUserRepository;
|
|
|
|
import com.baiye.modules.system.service.CompanyService;
|
|
|
|
import com.baiye.modules.system.service.CompanyService;
|
|
|
|
import com.baiye.service.UserCacheClean;
|
|
|
|
import com.baiye.service.UserCacheClean;
|
|
|
|
import com.baiye.modules.system.domain.Role;
|
|
|
|
import com.baiye.modules.system.domain.Role;
|
|
|
@ -82,6 +84,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
private final PasswordEncoder passwordEncoder;
|
|
|
|
private final PasswordEncoder passwordEncoder;
|
|
|
|
private final OnlineUserService onlineUserService;
|
|
|
|
private final OnlineUserService onlineUserService;
|
|
|
|
|
|
|
|
private final OrganizeUserRepository organizeUserRepository;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -277,6 +280,11 @@ public class UserServiceImpl implements UserService {
|
|
|
|
UserDto user = findById(id);
|
|
|
|
UserDto user = findById(id);
|
|
|
|
delCaches(user.getId(), user.getUsername());
|
|
|
|
delCaches(user.getId(), user.getUsername());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//查询是否已经分配到组
|
|
|
|
|
|
|
|
List<OrganizeUser> organizeUserList = organizeUserRepository.findByUserIdIn(ids);
|
|
|
|
|
|
|
|
if (organizeUserList != null || organizeUserList.size() > 0){
|
|
|
|
|
|
|
|
throw new BadRequestException("用户已经分配到组,无法删除");
|
|
|
|
|
|
|
|
}
|
|
|
|
userRepository.deleteAllByIdIn(ids);
|
|
|
|
userRepository.deleteAllByIdIn(ids);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|