diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java b/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java index f06183a..4f2c076 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java @@ -4,7 +4,6 @@ import com.starry.admin.modules.platform.entity.SysTenantEntity; import com.starry.admin.modules.platform.service.ISysTenantService; import com.starry.admin.modules.platform.vo.SysTenantAddVo; import com.starry.admin.modules.platform.vo.SysTenantQueryVo; -import com.starry.admin.utils.ExcelUtils; import com.starry.common.annotation.Log; import com.starry.common.enums.BusinessType; import com.starry.common.result.R; @@ -14,7 +13,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; /** @@ -50,16 +48,6 @@ public class SysTenantController { return R.ok(sysTenantService.selectSysTenantList(vo)); } - /** - * 导出租户表列表 - */ - @PreAuthorize("@customSs.hasPermission('platform:tenant:export')") - @Log(title = "租户表", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SysTenantQueryVo sysTenantEntity) { - ExcelUtils.exportEasyExcel(response, SysTenantEntity.class, sysTenantService.selectSysTenantList(sysTenantEntity).getRecords(), "租户表数据"); - } - /** * 获取租户表详细信息 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java index 7f98a5a..7f3b703 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.platform.entity.SysTenantEntity; import com.starry.admin.modules.platform.vo.SysTenantQueryVo; -import com.starry.admin.modules.platform.vo.TenantResultVo; import com.starry.common.result.R; import java.util.List; @@ -46,7 +45,7 @@ public interface ISysTenantService extends IService { * @param sysTenantEntity 租户表 * @return 租户表集合 */ - IPage selectSysTenantList(SysTenantQueryVo sysTenantEntity); + IPage selectSysTenantList(SysTenantQueryVo sysTenantEntity); /** * 新增租户表 diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java index dae1b8d..73fb49f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java @@ -16,7 +16,6 @@ import com.starry.admin.modules.platform.mapper.SysTenantMapper; import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper; import com.starry.admin.modules.platform.service.ISysTenantService; import com.starry.admin.modules.platform.vo.SysTenantQueryVo; -import com.starry.admin.modules.platform.vo.TenantResultVo; import com.starry.admin.modules.system.entity.*; import com.starry.admin.modules.system.mapper.*; import com.starry.admin.modules.system.service.SysRoleMenuService; @@ -37,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Arrays; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -103,21 +103,23 @@ public class SysTenantServiceImpl extends ServiceImpl selectSysTenantList(SysTenantQueryVo vo) { + public IPage selectSysTenantList(SysTenantQueryVo vo) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StrUtil.isNotBlank(vo.getTenantStatus())) { - wrapper.eq(SysTenantEntity::getTenantStatus, vo.getTenantStatus()); - } + wrapper.orderByDesc(SysTenantEntity::getTenantId); + //if (StrUtil.isNotBlank(vo.getTenantStatus())) { + // wrapper.eq(SysTenantEntity::getTenantStatus, vo.getTenantStatus()); + //} if (StrUtil.isNotBlank(vo.getTenantName())) { wrapper.like(SysTenantEntity::getTenantName, vo.getTenantName()); } - if (StrUtil.isNotBlank(vo.getBeginTime())) { - wrapper.ge(SysTenantEntity::getTenantTime, vo.getBeginTime()); - } - if (StrUtil.isNotBlank(vo.getEndTime())) { - wrapper.le(SysTenantEntity::getTenantTime, vo.getEndTime()); - } - return sysTenantMapper.selectSysTenantList(new Page<>(vo.getPageNum(), vo.getPageSize()), vo); + //if (StrUtil.isNotBlank(vo.getBeginTime())) { + // wrapper.ge(SysTenantEntity::getTenantTime, vo.getBeginTime()); + //} + //if (StrUtil.isNotBlank(vo.getEndTime())) { + // wrapper.le(SysTenantEntity::getTenantTime, vo.getEndTime()); + //} + Page page = new Page<>(vo.getPageNum(), vo.getPageSize()); + return this.baseMapper.selectPage(page, wrapper); } /** @@ -195,6 +197,7 @@ public class SysTenantServiceImpl extends ServiceImpl { * 租户类型;0:公司;1:部门;2:个人;3:其他 */ @NotBlank(message = "租户类型不能为空") - private String tenantType; + private String tenantType = "0"; /** * 用户状态;0:正常,1:停用 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java index 751790e..9e76baa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java @@ -152,7 +152,7 @@ public class SysMenuServiceImpl extends ServiceImpl