From 8ecbdfd47223d4800ef09c0cdb8fd932d420a714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Tue, 18 Apr 2023 13:24:24 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E4=B8=8B=E6=8B=89=E9=80=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20=E8=BF=87=E6=BB=A4=E6=8E=89=E5=B7=B2=E7=BB=8F=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E7=9A=84=E5=A5=97=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysTenantPackageController.java  | 10 ++++++++++
 .../system/service/ISysTenantPackageService.java       |  5 +++++
 .../service/impl/SysTenantPackageServiceImpl.java      |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java
index 01721764c..7d99916d0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java
@@ -48,6 +48,16 @@ public class SysTenantPackageController extends BaseController {
         return tenantPackageService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询租户套餐下拉选列表
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:list")
+    @GetMapping("/selectList")
+    public R<List<SysTenantPackageVo>> selectList() {
+        return R.ok(tenantPackageService.selectList());
+    }
+
     /**
      * 导出租户套餐列表
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java
index 122ff4020..cdb887ca6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java
@@ -25,6 +25,11 @@ public interface ISysTenantPackageService {
      */
     TableDataInfo<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageQuery pageQuery);
 
+    /**
+     * 查询租户套餐已启用列表
+     */
+    List<SysTenantPackageVo> selectList();
+
     /**
      * 查询租户套餐列表
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java
index 8b9224be1..5b6e5ecba 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java
@@ -1,6 +1,7 @@
 package org.dromara.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -55,6 +56,12 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
         return TableDataInfo.build(result);
     }
 
+    @Override
+    public List<SysTenantPackageVo> selectList() {
+        return baseMapper.selectVoList(new LambdaQueryWrapper<SysTenantPackage>()
+                .eq(SysTenantPackage::getStatus, TenantConstants.NORMAL));
+    }
+
     /**
      * 查询租户套餐列表
      */