abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改造租户

Browse Source
This commit is contained in:
fxh 2025-07-23 16:21:10 +08:00
parent 79cb33cf13
commit f058de3736
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java
View File

@ -64,7 +64,7 @@ public class SysTenantExtendBo {
private LocalDateTime expireTime;
@Schema(description = "店铺名称")
private String shopName;
private String storeName;
@Schema(description = "企业类型")
private String companyType;

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java
View File

@ -144,4 +144,7 @@ public class TenantDTO {
@Schema(description = "签约状态")
private String signStatus;
@Schema(description = "邀请人名称")
private String inviteUserName;
}

9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java
View File

@ -57,9 +57,10 @@ public interface SysTenantMapper extends BaseMapperPlus<SysTenant, SysTenantVo>
List<TenantDTO> 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);
}

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
View File

@ -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());

4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml
View File

@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.personName != null and query.personName != ''">
AND e.person_name LIKE CONCAT('%', #{query.personName}, '%')
</if>
<if test="query.shopName != null and query.shopName != ''">
AND e.store_name LIKE CONCAT('%', #{query.shopName}, '%')
<if test="query.storeName != null and query.storeName != ''">
AND e.store_name LIKE CONCAT('%', #{query.storeName}, '%')
</if>
<if test="query.contactUserName != null and query.contactUserName != ''">
AND t.contact_user_name LIKE CONCAT('%', #{query.contactUserName}, '%')