From d05ce7336c1778f443f67d4d330d14d2771f0b65 Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Mon, 24 Nov 2025 21:18:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenant):=20=E4=BF=AE=E6=AD=A3=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E7=A7=9F=E6=88=B7=E5=A5=97=E9=A4=90MyBatis=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E5=8F=8AVO=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/TenantAgencyPackagePageReqVO.java           |  2 +-
 .../vo/TenantAgencyPackageRespVO.java              |  2 +-
 .../tenantagencypackage/TenantAgencyPackageDO.java |  6 +++++-
 .../TenantAgencyPackageMapper.java                 |  1 +
 .../TenantAgencyPackageServiceImpl.java            | 12 ++++++------
 .../resources/mapper/TenantAgencyPackageMapper.xml | 14 ++++++++++++++
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java
index c177571..1345191 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java
@@ -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)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java
index 7237a88..2beb224 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java
@@ -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("创建时间")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java
index 668da28..e56ec4f 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java
@@ -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;
+
     /**
      * 套餐天数
      */
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantagencypackage/TenantAgencyPackageMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantagencypackage/TenantAgencyPackageMapper.java
index 2f1e644..6a820b0 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantagencypackage/TenantAgencyPackageMapper.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenantagencypackage/TenantAgencyPackageMapper.java
@@ -38,4 +38,5 @@ public interface TenantAgencyPackageMapper extends BaseMapperX<TenantAgencyPacka
         return selectList(TenantAgencyPackageDO::getStatus, status);
     }
 
+    TenantAgencyPackageDO selectWithXml(Long packageId);
 }
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantagencypackage/TenantAgencyPackageServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantagencypackage/TenantAgencyPackageServiceImpl.java
index c179c63..10a020d 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantagencypackage/TenantAgencyPackageServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantagencypackage/TenantAgencyPackageServiceImpl.java
@@ -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;
     }
 
 }
\ No newline at end of file
diff --git a/yudao-module-system/src/main/resources/mapper/TenantAgencyPackageMapper.xml b/yudao-module-system/src/main/resources/mapper/TenantAgencyPackageMapper.xml
index e455b72..ff228aa 100644
--- a/yudao-module-system/src/main/resources/mapper/TenantAgencyPackageMapper.xml
+++ b/yudao-module-system/src/main/resources/mapper/TenantAgencyPackageMapper.xml
@@ -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>
\ No newline at end of file