mirror of
				https://github.com/dromara/RuoYi-Vue-Plus.git
				synced 2025-11-04 08:13:44 +08:00 
			
		
		
		
	add 增加 租户套餐下拉选接口 过滤掉已经关闭的套餐
This commit is contained in:
		@@ -48,6 +48,16 @@ public class SysTenantPackageController extends BaseController {
 | 
				
			|||||||
        return tenantPackageService.queryPageList(bo, pageQuery);
 | 
					        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());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 导出租户套餐列表
 | 
					     * 导出租户套餐列表
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,6 +25,11 @@ public interface ISysTenantPackageService {
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    TableDataInfo<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageQuery pageQuery);
 | 
					    TableDataInfo<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageQuery pageQuery);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * 查询租户套餐已启用列表
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    List<SysTenantPackageVo> selectList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 查询租户套餐列表
 | 
					     * 查询租户套餐列表
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,7 @@
 | 
				
			|||||||
package org.dromara.system.service.impl;
 | 
					package org.dromara.system.service.impl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import cn.hutool.core.collection.CollUtil;
 | 
					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.exception.ServiceException;
 | 
				
			||||||
import org.dromara.common.core.utils.MapstructUtils;
 | 
					import org.dromara.common.core.utils.MapstructUtils;
 | 
				
			||||||
import org.dromara.common.core.utils.StringUtils;
 | 
					import org.dromara.common.core.utils.StringUtils;
 | 
				
			||||||
@@ -55,6 +56,12 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
 | 
				
			|||||||
        return TableDataInfo.build(result);
 | 
					        return TableDataInfo.build(result);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public List<SysTenantPackageVo> selectList() {
 | 
				
			||||||
 | 
					        return baseMapper.selectVoList(new LambdaQueryWrapper<SysTenantPackage>()
 | 
				
			||||||
 | 
					                .eq(SysTenantPackage::getStatus, TenantConstants.NORMAL));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 查询租户套餐列表
 | 
					     * 查询租户套餐列表
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user