|
|
|
@ -7,15 +7,7 @@ import info.bukova.isspst.data.UserSettingsData;
|
|
|
|
|
import info.bukova.isspst.security.AuthMethod;
|
|
|
|
|
import info.bukova.isspst.services.AbstractService;
|
|
|
|
|
import info.bukova.isspst.services.StringXmlMarshaller;
|
|
|
|
|
//import info.bukova.isspst.services.LazyLoader;
|
|
|
|
|
|
|
|
|
|
import info.bukova.isspst.services.workgroups.WorkgroupService;
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.HashSet;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
|
import org.exolab.castor.xml.Marshaller;
|
|
|
|
|
import org.exolab.castor.xml.Unmarshaller;
|
|
|
|
|
import org.hibernate.LazyInitializationException;
|
|
|
|
@ -31,6 +23,13 @@ import org.springframework.security.core.userdetails.UserDetails;
|
|
|
|
|
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.HashSet;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
|
//import info.bukova.isspst.services.LazyLoader;
|
|
|
|
|
|
|
|
|
|
public class UserServiceImpl extends AbstractService<User> implements UserService {
|
|
|
|
|
|
|
|
|
|
private PasswordEncoder encoder;
|
|
|
|
@ -220,6 +219,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public void delete(User entity) {
|
|
|
|
|
workgroupService.loadParents(entity);
|
|
|
|
|
|
|
|
|
|