@@ -40,7 +40,12 @@ public abstract class BaseDaoJPA<T> implements BaseDao<T> {
|
||||
|
||||
@Override
|
||||
public void delete(T entity) {
|
||||
sessionFactory.getCurrentSession().delete(entity);
|
||||
try {
|
||||
sessionFactory.getCurrentSession().delete(entity);
|
||||
} catch (NonUniqueObjectException e) {
|
||||
Object o = sessionFactory.getCurrentSession().merge(entity);
|
||||
sessionFactory.getCurrentSession().delete(o);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -124,7 +124,7 @@ public class WorkgroupForm extends FormViewModel<Workgroup> {
|
||||
return;
|
||||
}
|
||||
|
||||
getDataBean().removeMember(u);
|
||||
workgroupService.removeMember(getDataBean(), u);
|
||||
|
||||
if (!target.equals("users")) {
|
||||
moveUser(u.getMember(), event);
|
||||
|
||||
Reference in New Issue
Block a user