Merge remote-tracking branch 'origin/zuhuduan' into zuhuduan

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantPackageController.java

@@ -13,6 +13,7 @@ import com.dsk.common.core.validate.AddGroup;
 import com.dsk.common.core.validate.EditGroup;
 import com.dsk.common.enums.BusinessType;
 import com.dsk.system.domain.bo.SysTenantPackageBo;
+import com.dsk.system.domain.vo.SysTenantPackageSelectVo;
 import com.dsk.system.domain.vo.SysTenantPackageVo;
 import com.dsk.system.service.ISysTenantPackageService;
 import lombok.RequiredArgsConstructor;
@@ -56,7 +57,7 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/selectList")
-    public R<List<SysTenantPackageVo>> selectList() {
+    public R<List<SysTenantPackageSelectVo>> selectList() {
         return R.ok(tenantPackageService.selectList());
     }
 

dsk-system/src/main/java/com/dsk/system/domain/vo/SysTenantPackageSelectVo.java

+package com.dsk.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.dsk.common.annotation.ExcelDictFormat;
+import com.dsk.common.convert.ExcelDictConvert;
+import com.dsk.system.domain.SysTenantPackage;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author sxk
+ * @date 2023.08.23
+ * @description:
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysTenantPackage.class)
+public class SysTenantPackageSelectVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户套餐id
+     */
+    @ExcelProperty(value = "租户套餐id")
+    private Long packageId;
+
+    /**
+     * 套餐名称
+     */
+    @ExcelProperty(value = "套餐名称")
+    private String packageName;
+
+}

dsk-system/src/main/java/com/dsk/system/service/ISysTenantPackageService.java

@@ -3,6 +3,7 @@ package com.dsk.system.service;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.domain.bo.SysTenantPackageBo;
+import com.dsk.system.domain.vo.SysTenantPackageSelectVo;
 import com.dsk.system.domain.vo.SysTenantPackageVo;
 
 import java.util.List;
@@ -22,7 +23,7 @@ public interface ISysTenantPackageService {
     /**
      * 查询租户套餐已启用列表
      */
-    List<SysTenantPackageVo> selectList();
+    List<SysTenantPackageSelectVo> selectList();
 
 //    /**
 //     * 查询租户套餐列表

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantPackageServiceImpl.java

@@ -13,6 +13,7 @@ import com.dsk.common.utils.StringUtils;
 import com.dsk.system.domain.SysTenant;
 import com.dsk.system.domain.SysTenantPackage;
 import com.dsk.system.domain.bo.SysTenantPackageBo;
+import com.dsk.system.domain.vo.SysTenantPackageSelectVo;
 import com.dsk.system.domain.vo.SysTenantPackageVo;
 import com.dsk.system.mapper.SysTenantMapper;
 import com.dsk.system.mapper.SysTenantPackageMapper;
@@ -55,9 +56,10 @@ public class ISysTenantPackageServiceImpl implements ISysTenantPackageService {
      * 查询租户套餐已启用列表
      */
     @Override
-    public List<SysTenantPackageVo> selectList() {
-        return baseMapper.selectVoList(new LambdaQueryWrapper<SysTenantPackage>()
+    public List<SysTenantPackageSelectVo> selectList() {
+        List<SysTenantPackageVo> tenantPackageVo = baseMapper.selectVoList(new LambdaQueryWrapper<SysTenantPackage>()
                 .eq(SysTenantPackage::getStatus, TenantConstants.NORMAL));
+        return BeanUtil.copyToList(tenantPackageVo, SysTenantPackageSelectVo.class);
     }
 
 //    /**

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

@@ -130,8 +130,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             //Sass超管
             menus = baseMapper.selectMenuTreeAll();
         } else if (LoginHelper.isTenantAdmin()) {
-            //租户管理员
-//            String ids = baseMapper.selectMenuIdsByTenantId(LoginHelper.getTenantId());
+//            租户管理员
             SysTenantVo sysTenantVo = tenantMapper.selectVoOne(new LambdaQueryWrapper<SysTenant>().eq(SysTenant::getTenantId, LoginHelper.getTenantId()));
             SysTenantPackageVo sysTenantPackageVo = tenantPackageMapper.selectVoOne(new LambdaQueryWrapper<SysTenantPackage>().eq(SysTenantPackage::getPackageId, sysTenantVo.getPackageId()));
             List<Long> menuIds = StringUtils.splitTo(sysTenantPackageVo.getMenuIds(), Convert::toLong);