Merge remote-tracking branch 'origin/wzj-main' into wzj-main

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<SysTenantVo> sysTenantList = tenantService.getByParentId(sysTenantVo.getId());
         List<TenantListVo> 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);