Browse Source

更新租户列表返回租户对应在users表中对应的id

tags/v2.4.1
xiaoying 1 year ago
parent
commit
c784d748b0
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      tuoheng_oidc_admin/src/main/java/com/tuoheng/model/vo/TenantVo.java
  2. +1
    -1
      tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/ClientUserServiceImpl.java

+ 5
- 0
tuoheng_oidc_admin/src/main/java/com/tuoheng/model/vo/TenantVo.java View File

@@ -56,4 +56,9 @@ public class TenantVo {
*/
private String districtName;

/**
* 租户id对应在用户表中的id
*/
private Long tenantId;

}

+ 1
- 1
tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/ClientUserServiceImpl.java View File

@@ -344,7 +344,7 @@ public class ClientUserServiceImpl implements ClientUserSevice {
IPage<TenantPo> pageData = tenantMapper.findList(page, query);
pageData.convert(x -> {
TenantVo vo = Convert.convert(TenantVo.class, x);
vo.setId(x.getUserId());
vo.setTenantId(x.getUserId());
vo.setTenantCode(x.getCode());
vo.setTenantName(x.getName());
Long userId = x.getUserId();

Loading…
Cancel
Save