|
@@ -159,10 +159,10 @@ public class AuthorizationController {
|
|
|
resources.setNickName(realName);
|
|
|
resources.setPhone(phoneNumber);
|
|
|
resources.setEmail(email);
|
|
|
+ List<RoleDto> roleDtos = roleService.queryAll();
|
|
|
+ Set<Role> roles=new HashSet<>();
|
|
|
if(jsonArray!=null && jsonArray.size()>0){
|
|
|
- List<RoleDto> roleDtos = roleService.queryAll();
|
|
|
Map<String, List<RoleDto>> collect = roleDtos.stream().collect(Collectors.groupingBy(RoleDto::getName));
|
|
|
- Set<Role> roles=new HashSet<>();
|
|
|
for(int i=0;i<jsonArray.size();i++){
|
|
|
JSONObject obj = jsonArray.getJSONObject(i);
|
|
|
Object roleName = obj.get("roleName");
|
|
@@ -176,8 +176,14 @@ public class AuthorizationController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- resources.setRoles(roles);
|
|
|
}
|
|
|
+ if(CollUtil.isEmpty(roles)){
|
|
|
+ Role role=new Role();
|
|
|
+ RoleDto roleDto = roleDtos.get(0);
|
|
|
+ role.setId(roleDto.getId());
|
|
|
+ roles.add(role);
|
|
|
+ }
|
|
|
+ resources.setRoles(roles);
|
|
|
pwd="123456";
|
|
|
resources.setPassword(passwordEncoder.encode(pwd));
|
|
|
resources.setRsaPwd(RsaUtils.encryptByPublicKey(RsaProperties.publicKey, pwd));
|