From 8904c39e81e664fe58e556493fa9271f0651231c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Fri, 28 Feb 2020 13:56:47 +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

---
 db/2pigxx.sql                                                 | 2 +-
 pigx-common/pigx-common-bom/pom.xml                           | 2 +-
 .../pig4cloud/pigx/admin/controller/SysTenantController.java  | 4 ++--
 .../pigx/admin/service/impl/SysTenantServiceImpl.java         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index 4a064090a..1f1659afc 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -698,7 +698,7 @@ CREATE TABLE `sys_tenant` (
 -- Records of sys_tenant
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_tenant` VALUES (1, '北京分公司', '1', '2019-05-15 00:00:00', '2020-05-15 00:00:00', '0', '0', '2019-05-15 15:44:57', '2019-05-18 14:47:30');
+INSERT INTO `sys_tenant` VALUES (1, '北京分公司', '1', '2019-05-15 00:00:00', '2029-05-15 00:00:00', '0', '0', '2019-05-15 15:44:57', '2019-05-18 14:47:30');
 COMMIT;
 
 -- ----------------------------
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 6e204391d..1e8015d12 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>pigx-cloud-dependencies-parent</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>Hoxton.SR1</version>
+		<version>Hoxton.SR2</version>
 		<relativePath/>
 	</parent>
 
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 8e20a046f..16f87caed 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
@@ -126,8 +126,8 @@ public class SysTenantController {
 	public R list() {
 		List<SysTenant> tenants = sysTenantService.getNormalTenant()
 				.stream()
-				.filter(tenant -> tenant.getStartTime().isAfter(LocalDate.now()))
-				.filter(tenant -> tenant.getEndTime().isBefore(LocalDate.now()))
+				.filter(tenant -> tenant.getStartTime().isBefore(LocalDate.now()))
+				.filter(tenant -> tenant.getEndTime().isAfter(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/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
index 7fda4accb..ce9db2d23 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
@@ -73,7 +73,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 	@Override
 	@Cacheable(value = CacheConstants.TENANT_DETAILS)
 	public List<SysTenant> getNormalTenant() {
-		return list(Wrappers.<SysTenant>lambdaQuery()
+		return baseMapper.selectList(Wrappers.<SysTenant>lambdaQuery()
 				.eq(SysTenant::getStatus, CommonConstants.STATUS_NORMAL));
 	}