From 8ecbdfd47223d4800ef09c0cdb8fd932d420a714 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 18 四月 2023 13:24:33 +0800
Subject: [PATCH] add 增加 租户套餐下拉选接口 过滤掉已经关闭的套餐
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java | 7 +++++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java | 10 ++++++++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java | 5 +++++
3 files changed, 22 insertions(+), 0 deletions(-)
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 0172176..7d99916 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
@@ -49,6 +49,16 @@
}
/**
+ * 鏌ヨ绉熸埛濂楅涓嬫媺閫夊垪琛�
+ */
+ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+ @SaCheckPermission("system:tenantPackage:list")
+ @GetMapping("/selectList")
+ public R<List<SysTenantPackageVo>> selectList() {
+ return R.ok(tenantPackageService.selectList());
+ }
+
+ /**
* 瀵煎嚭绉熸埛濂楅鍒楄〃
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
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 122ff40..cdb887c 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
@@ -26,6 +26,11 @@
TableDataInfo<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageQuery pageQuery);
/**
+ * 鏌ヨ绉熸埛濂楅宸插惎鐢ㄥ垪琛�
+ */
+ List<SysTenantPackageVo> selectList();
+
+ /**
* 鏌ヨ绉熸埛濂楅鍒楄〃
*/
List<SysTenantPackageVo> queryList(SysTenantPackageBo bo);
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 8b9224b..5b6e5ec 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 @@
return TableDataInfo.build(result);
}
+ @Override
+ public List<SysTenantPackageVo> selectList() {
+ return baseMapper.selectVoList(new LambdaQueryWrapper<SysTenantPackage>()
+ .eq(SysTenantPackage::getStatus, TenantConstants.NORMAL));
+ }
+
/**
* 鏌ヨ绉熸埛濂楅鍒楄〃
*/
--
Gitblit v1.9.3