|
@@ -519,10 +519,10 @@ public class UserServiceImpl implements UserService {
|
|
|
public void removeUser(Long uu) {
|
|
public void removeUser(Long uu) {
|
|
|
User user = userDao.findOne(uu);
|
|
User user = userDao.findOne(uu);
|
|
|
if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
|
|
if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
|
|
|
-// user.removeEnterprise(SystemSession.getUser().getEnterprise());
|
|
|
|
|
-// if (user.getEnterprises().size() == 0)
|
|
|
|
|
-// user.setEnable((short) Status.DISABLED.value());
|
|
|
|
|
-// userDao.save(user);
|
|
|
|
|
|
|
+ user.removeEnterprise(SystemSession.getUser().getEnterprise());
|
|
|
|
|
+ /*if (user.getEnterprises().size() == 0)
|
|
|
|
|
+ user.setEnable((short) Status.DISABLED.value());*/
|
|
|
|
|
+ userDao.save(user);
|
|
|
try {
|
|
try {
|
|
|
com.uas.sso.util.AccountUtils.removeUser(uu,SystemSession.getUser().getEnterprise().getUu());
|
|
com.uas.sso.util.AccountUtils.removeUser(uu,SystemSession.getUser().getEnterprise().getUu());
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|