Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227
This commit is contained in:
commit
10b79d1e33
@ -260,15 +260,15 @@ public class SaasRoleController implements TyrSaasRoleApi {
|
|||||||
if (exchangeRole == null) {
|
if (exchangeRole == null) {
|
||||||
throw new ServiceException("未找到可以移动的位置");
|
throw new ServiceException("未找到可以移动的位置");
|
||||||
}
|
}
|
||||||
roleService.saveOrUpdate(SaveOrUpdateRoleVO.builder()
|
SaasRole newSaasRole = new SaasRole();
|
||||||
.id(saasRole.getId())
|
newSaasRole.setId(saasRole.getId());
|
||||||
.sort(exchangeRole.getSort())
|
newSaasRole.setSort(exchangeRole.getSort());
|
||||||
.build());
|
roleService.updateById(newSaasRole);
|
||||||
|
|
||||||
roleService.saveOrUpdate(SaveOrUpdateRoleVO.builder()
|
SaasRole oldSaasRole = new SaasRole();
|
||||||
.id(exchangeRole.getId())
|
oldSaasRole.setId(exchangeRole.getId());
|
||||||
.sort(saasRole.getSort())
|
oldSaasRole.setSort(saasRole.getSort());
|
||||||
.build());
|
roleService.updateById(oldSaasRole);
|
||||||
return ApiResult.ok();
|
return ApiResult.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user