|
|
@@ -572,7 +572,7 @@ public class OrganizationUserServiceImpl extends SuperService {
|
|
|
}
|
|
|
}
|
|
|
roles = roles.stream().distinct().collect(Collectors.toList());
|
|
|
-
|
|
|
+
|
|
|
//权限中心: 在角色组添加用户
|
|
|
roleServiceImpl.userBindRoles(userId, roles);
|
|
|
|
|
|
@@ -1045,6 +1045,8 @@ public class OrganizationUserServiceImpl extends SuperService {
|
|
|
param.setIsSearchProject(Boolean.TRUE);
|
|
|
Assert.hasText(param.getProjectOid(), "projectOid不能为空");
|
|
|
|
|
|
+ param.setOrgUserState(OrgUserState.Formal);
|
|
|
+ param.setAddType(null);
|
|
|
Organization organization = organizationDao.findTopByOid(param.getProjectOid());
|
|
|
Pageable pageable = PageRequest.of(0, Integer.MAX_VALUE);
|
|
|
Page<OrganizationUser> page = organizationUserDao.page(pageable, param);
|