diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java index 90014feab..a31b523b5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java @@ -64,7 +64,7 @@ public class SysTenantExtendBo { private LocalDateTime expireTime; @Schema(description = "店铺名称") - private String shopName; + private String storeName; @Schema(description = "企业类型") private String companyType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java index 28692565c..d21591db8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java @@ -144,4 +144,7 @@ public class TenantDTO { @Schema(description = "签约状态") private String signStatus; + + @Schema(description = "邀请人名称") + private String inviteUserName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java index dcde5ef8d..f94cbfdd5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java @@ -57,9 +57,10 @@ public interface SysTenantMapper extends BaseMapperPlus List getAll(SysTenantBo bo); - @Select(" SELECT t.*, e.* \n" + - " FROM sys_tenant t\n" + - " LEFT JOIN sys_tenant_extend e ON t.id = e.store_id\n" + - " WHERE t.id = #{id}") + @Select("SELECT t.*, e.*, m.nickname AS inviteUserName \n" + + "FROM sys_tenant t\n" + + "LEFT JOIN sys_tenant_extend e ON t.id = e.store_id\n" + + "LEFT JOIN ums_member m ON e.invite_user_id = m.id\n" + + "WHERE t.id = #{id}") TenantDTO getById(Long id); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 0a7269046..32edea070 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -152,7 +152,7 @@ public class SysTenantServiceImpl implements ISysTenantService { tenant.setAttachmentimg(bo.getAttachmentimg()); tenant.setPromoteListimg(bo.getPromoteListimg()); tenant.setExpireTime(bo.getExpireTime()); - tenant.setStoreName(bo.getShopName()); + tenant.setStoreName(bo.getStoreName()); tenant.setCompanyType(bo.getCompanyType()); tenant.setBusinessTypes(bo.getBusinessTypes()); tenant.setRelatedimg(bo.getRelatedimg()); @@ -369,7 +369,7 @@ public class SysTenantServiceImpl implements ISysTenantService { existingTenant.setAttachmentimg(bo.getAttachmentimg()); existingTenant.setPromoteListimg(bo.getPromoteListimg()); existingTenant.setExpireTime(bo.getExpireTime()); - existingTenant.setStoreName(bo.getShopName()); + existingTenant.setStoreName(bo.getStoreName()); existingTenant.setCompanyType(bo.getCompanyType()); existingTenant.setBusinessTypes(bo.getBusinessTypes()); existingTenant.setRelatedimg(bo.getRelatedimg()); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml index 0ab0a4a2e..7184e2be0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml @@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND e.person_name LIKE CONCAT('%', #{query.personName}, '%') - - AND e.store_name LIKE CONCAT('%', #{query.shopName}, '%') + + AND e.store_name LIKE CONCAT('%', #{query.storeName}, '%') AND t.contact_user_name LIKE CONCAT('%', #{query.contactUserName}, '%')