From 4ee568bf5cd8bdeb367a28559d5d05dd563c3992 Mon Sep 17 00:00:00 2001 From: huk Date: Sat, 27 Sep 2025 13:21:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(auth):=20=E6=A0=B9=E6=8D=AE=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E5=8A=A8=E6=80=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/web/controller/AuthController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index e530a2d0c..e9743ebdc 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -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.RegisterBody; 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.encrypt.annotation.ApiEncrypt; import org.dromara.common.json.utils.JsonUtils; @@ -206,7 +207,17 @@ public class AuthController { List sysTenantList = tenantService.getByParentId(sysTenantVo.getId()); List voList = MapstructUtils.convert(sysTenantList, TenantListVo.class); 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);