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 @@
pigx-cloud-dependencies-parent
com.pig4cloud
- Hoxton.SR1
+ Hoxton.SR2
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 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 getNormalTenant() {
- return list(Wrappers.lambdaQuery()
+ return baseMapper.selectList(Wrappers.lambdaQuery()
.eq(SysTenant::getStatus, CommonConstants.STATUS_NORMAL));
}