Commit 5fdee0cd by shenjunjie

修复事件传播bug

parent 36b3570e
...@@ -220,10 +220,6 @@ public class UserServiceImpl implements UserService { ...@@ -220,10 +220,6 @@ public class UserServiceImpl implements UserService {
CenterUser centerUser = userInfoClient.getUserById(Integer.parseInt(UserThreadLocal.getUserId())); CenterUser centerUser = userInfoClient.getUserById(Integer.parseInt(UserThreadLocal.getUserId()));
user = User.createFromCenterUser(centerUser); user = User.createFromCenterUser(centerUser);
} }
List<UserProjectOldDaoImpl.UserProjectOld> userProjects = userProjectOldDao.findList(new Query(Criteria.where("userId").is(user.getId())));
if (userProjects.isEmpty()) {
ExceptionCast.cast(CommonCodeEnum.FAIL);
}
// 超级管理员 // 超级管理员
if (userOld.isSuperAdmin()) { if (userOld.isSuperAdmin()) {
user.setSuperAdmin(true); user.setSuperAdmin(true);
...@@ -231,6 +227,10 @@ public class UserServiceImpl implements UserService { ...@@ -231,6 +227,10 @@ public class UserServiceImpl implements UserService {
userOldDao.updateOneByIdWithField(userOld.getId(), Update.update("bindUser", true)); userOldDao.updateOneByIdWithField(userOld.getId(), Update.update("bindUser", true));
return projectServiceImpl.getProjectListByUser(user, true); return projectServiceImpl.getProjectListByUser(user, true);
} }
List<UserProjectOldDaoImpl.UserProjectOld> userProjects = userProjectOldDao.findList(new Query(Criteria.where("userId").is(user.getId())));
if (userProjects.isEmpty()) {
ExceptionCast.cast(CommonCodeEnum.FAIL);
}
List<UserRole> userRoles = user.getRoles(); List<UserRole> userRoles = user.getRoles();
AtomicBoolean hit = new AtomicBoolean(false); AtomicBoolean hit = new AtomicBoolean(false);
// 遍历旧关系表 // 遍历旧关系表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment