Browse Source

新增编辑用户时是否包含机场

tags/v2.5.0^2
xiao 1 year ago
parent
commit
81fde4a7f5
2 changed files with 15 additions and 6 deletions
  1. +5
    -0
      tuoheng_oidc_admin/src/main/java/com/tuoheng/model/param/CreateClientTenantDto.java
  2. +10
    -6
      tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java

+ 5
- 0
tuoheng_oidc_admin/src/main/java/com/tuoheng/model/param/CreateClientTenantDto.java View File

*/ */
private Integer status; private Integer status;


/**
*是否包含机场平台
*/

private Boolean isAirport;
} }

+ 10
- 6
tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java View File

import com.tuoheng.common.CommonConfig; import com.tuoheng.common.CommonConfig;
import com.tuoheng.common.ServiceException; import com.tuoheng.common.ServiceException;
import com.tuoheng.common.ServiceExceptionEnum; import com.tuoheng.common.ServiceExceptionEnum;
import com.tuoheng.constant.*;
import com.tuoheng.constant.CommonConstant;
import com.tuoheng.constant.DictConstant;
import com.tuoheng.enums.MarkTypeEnum; import com.tuoheng.enums.MarkTypeEnum;
import com.tuoheng.mapper.*; import com.tuoheng.mapper.*;
import com.tuoheng.model.dto.LoginUser; import com.tuoheng.model.dto.LoginUser;
import com.tuoheng.service.TenantService; import com.tuoheng.service.TenantService;
import com.tuoheng.until.JsonResult; import com.tuoheng.until.JsonResult;
import com.tuoheng.until.MapUtils; import com.tuoheng.until.MapUtils;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;


import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;


/** /**
} }
CreateClientTenantDto dto = new CreateClientTenantDto(); CreateClientTenantDto dto = new CreateClientTenantDto();
dto.setId(query.getId()); dto.setId(query.getId());
//默认是否包含机场为false
Boolean isAirport = false;
//查询出租户的相关信息 //查询出租户的相关信息
Long tenantId = query.getId(); Long tenantId = query.getId();
//项目相关信息 //项目相关信息
List<ClientRoleDto> list = new ArrayList<>(); List<ClientRoleDto> list = new ArrayList<>();
List<ClientUserRolePo> clientUserRolePos = clientUserRoleMapper.selectListByUserId(tenantPo.getUserId()); List<ClientUserRolePo> clientUserRolePos = clientUserRoleMapper.selectListByUserId(tenantPo.getUserId());
for (ClientUserRolePo clientUserRolePo : clientUserRolePos) { for (ClientUserRolePo clientUserRolePo : clientUserRolePos) {
//判断是否包含机场
if ("tuoheng-airport-admin".equals(clientUserRolePo.getClientId())) {
isAirport = true;
}
ClientRoleDto clientRoleDto = new ClientRoleDto(); ClientRoleDto clientRoleDto = new ClientRoleDto();
//此处 暂时格式都为 tuoheng-hhz-web 等格式 如后续维护需要变更形式则此处代码需要更改 //此处 暂时格式都为 tuoheng-hhz-web 等格式 如后续维护需要变更形式则此处代码需要更改
clientRoleDto.setRoleId(clientUserRolePo.getRoleId()); clientRoleDto.setRoleId(clientUserRolePo.getRoleId());
list.add(clientRoleDto); list.add(clientRoleDto);
} }
dto.setClientRoleDtoList(list.stream().distinct().collect(Collectors.toList())); dto.setClientRoleDtoList(list.stream().distinct().collect(Collectors.toList()));
dto.setIsAirport(isAirport);
return JsonResult.success(dto); return JsonResult.success(dto);
} }



Loading…
Cancel
Save