Browse Source

add 增加 租户套餐下拉选接口 过滤掉已经关闭的套餐

疯狂的狮子li 2 năm trước cách đây
mục cha
commit
8ecbdfd472

+ 10 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java

@@ -49,6 +49,16 @@ public class SysTenantPackageController extends BaseController {
     }
 
     /**
+     * 查询租户套餐下拉选列表
+     */
+    @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)

+ 5 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java

@@ -26,6 +26,11 @@ public interface ISysTenantPackageService {
     TableDataInfo<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageQuery pageQuery);
 
     /**
+     * 查询租户套餐已启用列表
+     */
+    List<SysTenantPackageVo> selectList();
+
+    /**
      * 查询租户套餐列表
      */
     List<SysTenantPackageVo> queryList(SysTenantPackageBo bo);

+ 7 - 0
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));
+    }
+
     /**
      * 查询租户套餐列表
      */