|
|
@@ -225,7 +225,7 @@ public class AppAccountOidcServiceImpl implements AppAccountOidcService {
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public EndUserDTO updateProfile(ProfileUpdateRequest request) {
|
|
|
+ public AccountProfileInfoDTO updateProfile(ProfileUpdateRequest request) {
|
|
|
if (request == null || (request.getUserId() == null && !StringUtils.hasText(request.getLoginId()))) {
|
|
|
throw new ServiceException("参数不能为空");
|
|
|
}
|
|
|
@@ -251,9 +251,7 @@ public class AppAccountOidcServiceImpl implements AppAccountOidcService {
|
|
|
baseUser.setId(existing.getId());
|
|
|
}
|
|
|
poyeeAppBaseUserMapper.updateAppBaseUser(baseUser);
|
|
|
- AppBaseUser updated = poyeeAppBaseUserMapper.selectById(baseUser.getId());
|
|
|
- AppAccount account = updated == null ? null : poyeeAppAccountMapper.selectByLoginId(updated.getUsername());
|
|
|
- return toEndUser(updated == null ? request.getLoginId() : updated.getUsername(), account, updated);
|
|
|
+ return getCurrentProfile(baseUser.getId());
|
|
|
}
|
|
|
|
|
|
private boolean isSameAccount(AppAccount left, AppAccount right) {
|