From 79823b60290b4b101f15eb23eba4c7e9b25dbfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 24 Feb 2020 22:53:14 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#793=20=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/controller/SysTenantController.java | 6 +++--- .../com/pig4cloud/pigx/admin/service/SysTenantService.java | 2 +- .../pigx/admin/service/impl/SysTenantServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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)); }