feat(auth): 根据租户类型动态设置显示名称
This commit is contained in:
parent
b2a9624aac
commit
4ee568bf5c
@ -16,6 +16,7 @@ import org.dromara.common.core.domain.R;
|
|||||||
import org.dromara.common.core.domain.model.LoginBody;
|
import org.dromara.common.core.domain.model.LoginBody;
|
||||||
import org.dromara.common.core.domain.model.RegisterBody;
|
import org.dromara.common.core.domain.model.RegisterBody;
|
||||||
import org.dromara.common.core.domain.model.SocialLoginBody;
|
import org.dromara.common.core.domain.model.SocialLoginBody;
|
||||||
|
import org.dromara.common.core.enums.TenantType;
|
||||||
import org.dromara.common.core.utils.*;
|
import org.dromara.common.core.utils.*;
|
||||||
import org.dromara.common.encrypt.annotation.ApiEncrypt;
|
import org.dromara.common.encrypt.annotation.ApiEncrypt;
|
||||||
import org.dromara.common.json.utils.JsonUtils;
|
import org.dromara.common.json.utils.JsonUtils;
|
||||||
@ -206,7 +207,17 @@ public class AuthController {
|
|||||||
List<SysTenantVo> sysTenantList = tenantService.getByParentId(sysTenantVo.getId());
|
List<SysTenantVo> sysTenantList = tenantService.getByParentId(sysTenantVo.getId());
|
||||||
List<TenantListVo> voList = MapstructUtils.convert(sysTenantList, TenantListVo.class);
|
List<TenantListVo> voList = MapstructUtils.convert(sysTenantList, TenantListVo.class);
|
||||||
if (voList != null) {
|
if (voList != null) {
|
||||||
voList.add(TenantListVo.builder().tenantId(sysTenantVo.getTenantId()).companyName(sysTenantVo.getCompanyName()).domain(sysTenantVo.getDomain()).build());
|
String companyName = sysTenantVo.getCompanyName();
|
||||||
|
if(sysTenantVo.getType().equals(TenantType.AGENT.getType())){
|
||||||
|
companyName = sysTenantVo.getAgencyName();
|
||||||
|
} else if (sysTenantVo.getType().equals(TenantType.MERCHANT.getType())) {
|
||||||
|
companyName = sysTenantVo.getShopName();
|
||||||
|
}
|
||||||
|
TenantListVo tenantListVo = TenantListVo.builder().tenantId(sysTenantVo.getTenantId())
|
||||||
|
.companyName(companyName)
|
||||||
|
.domain(sysTenantVo.getDomain())
|
||||||
|
.build();
|
||||||
|
voList.add(tenantListVo);
|
||||||
}
|
}
|
||||||
result.setVoList(voList);
|
result.setVoList(voList);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user