ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tenant): 修正代理租户套餐MyBatis映射及VO类型错误

Browse Source
This commit is contained in:
ziin
2025-11-24 21:18:15 +08:00
parent 43dd7cf768
commit d05ce7336c
6 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java
View File

@@ -23,7 +23,7 @@ public class TenantAgencyPackagePageReqVO extends PageParam {
private String remark;
@Schema(description = "关联的菜单编号")
private String menuIds;
private Set<Long> menuIds;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java
View File

@@ -30,7 +30,7 @@ public class TenantAgencyPackageRespVO {
@Schema(description = "关联的菜单编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("关联的菜单编号")
private String menuIds;
private Set<Long> menuIds;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")

6
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.dal.dataobject.tenantagencypackage;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.*;
@@ -13,7 +14,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
*
* @author 总后台
*/
@TableName("system_tenant_agency_package")
@TableName(value = "system_tenant_agency_package",autoResultMap = true)
@KeySequence("system_tenant_agency_package_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@@ -21,6 +22,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@TenantIgnore
public class TenantAgencyPackageDO extends BaseDO {
/**
@@ -43,8 +45,10 @@ public class TenantAgencyPackageDO extends BaseDO {
/**
* 关联的菜单编号
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private Set<Long> menuIds;
/**
* 套餐天数
*/

1
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantagencypackage/TenantAgencyPackageMapper.java
View File

@@ -38,4 +38,5 @@ public interface TenantAgencyPackageMapper extends BaseMapperX<TenantAgencyPacka
return selectList(TenantAgencyPackageDO::getStatus, status);
}
TenantAgencyPackageDO selectWithXml(Long packageId);
}

12
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantagencypackage/TenantAgencyPackageServiceImpl.java
View File

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.service.tenantagencypackage;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO;
import cn.iocoder.yudao.module.system.dal.dataobject.tenantagencypackage.TenantAgencyPackageDO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -90,14 +89,15 @@ public class TenantAgencyPackageServiceImpl implements TenantAgencyPackageServic
@Override
public TenantAgencyPackageDO validTenantPackage(Long packageId) {
TenantAgencyPackageDO tenantPackage = tenantAgencyPackageMapper.selectById(packageId);
if (tenantPackage == null) {
TenantAgencyPackageDO tenantAgencyPackageDO = tenantAgencyPackageMapper.selectById(packageId);
if (tenantAgencyPackageDO == null) {
throw exception(TENANT_PACKAGE_NOT_EXISTS);
}
if (tenantPackage.getStatus().equals(CommonStatusEnum.DISABLE.getStatus())) {
throw exception(TENANT_PACKAGE_DISABLE, tenantPackage.getName());
if (tenantAgencyPackageDO.getStatus().equals(CommonStatusEnum.DISABLE.getStatus())) {
throw exception(TENANT_PACKAGE_DISABLE, tenantAgencyPackageDO.getName());
}
return tenantPackage;
return tenantAgencyPackageDO;
}
}

14
yudao-module-system/src/main/resources/mapper/TenantAgencyPackageMapper.xml
View File

@@ -8,5 +8,19 @@
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
<resultMap id="TenantAgencyPackageResultMap" type="cn.iocoder.yudao.module.system.dal.dataobject.tenantagencypackage.TenantAgencyPackageDO">
<id property="id" column="id" />
<result property="name" column="name" />
<result property="price" column="price" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="menuIds" column="menu_ids" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result property="createTime" column="create_time" />
</resultMap>
<select id="selectWithXml"
resultMap="TenantAgencyPackageResultMap">
select * from system_tenant_agency_package where id = #{id}
</select>
</mapper>