diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java index 951649105..8e20a046f 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java @@ -124,10 +124,10 @@ public class SysTenantController { @Inner(value = false) @GetMapping("/list") public R list() { - final LocalDate today = LocalDate.now(); - List tenants = sysTenantService.getNormal() + List tenants = sysTenantService.getNormalTenant() .stream() - .filter(sysTenant -> (sysTenant.getStartTime().isAfter(today) && sysTenant.getEndTime().isBefore(today))) + .filter(tenant -> tenant.getStartTime().isAfter(LocalDate.now())) + .filter(tenant -> tenant.getEndTime().isBefore(LocalDate.now())) .collect(Collectors.toList()); return R.ok(tenants); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysTenantService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysTenantService.java index db658989a..b787d0722 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysTenantService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysTenantService.java @@ -35,7 +35,7 @@ public interface SysTenantService extends IService { * * @return */ - List getNormal(); + List getNormalTenant(); /** * 保存租户 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index a7e4da323..7fda4accb 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -72,7 +72,7 @@ public class SysTenantServiceImpl extends ServiceImpl getNormal() { + public List getNormalTenant() { return list(Wrappers.lambdaQuery() .eq(SysTenant::getStatus, CommonConstants.STATUS_NORMAL)); }