From 3cabc89f9bbe4c0efe4ab99dd8321fd8bdcb8236 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 23 Mar 2021 16:20:34 +0800
Subject: [PATCH] 1.还原客户信息 2.用户修改在线状态
---
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 45 ---------------------------------------------
1 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
index 9a1af8c..1ed526e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
@@ -91,26 +91,6 @@
public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) throws ParseException {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
- for (int j = 0; j < pages.getRecords().size(); j++) {
- Date expireTime = pages.getRecords().get(j).getExpireTime();
- //1.获取当前时间
- Date dd = new Date();
- SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String end = sim.format(dd);
- //把string类型转换为long类型的
-
- if (expireTime != null){
- long st = sim.parse(String.valueOf(expireTime)).getTime();
- long en = sim.parse(end).getTime();
- //计算天数
- int day = (int) ((st - en) / 86400000);
- if (day <= 30) {
- pages.getRecords().get(j).setType("1");
- } else {
- pages.getRecords().get(j).setType("0");
- }
- }
- }
return R.data(pages);
}
@@ -136,31 +116,6 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<Tenant>> page(Tenant tenant, Query query) throws ParseException {
IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
- for (int j = 0; j < pages.getRecords().size(); j++) {
- Date expireTimes = pages.getRecords().get(j).getExpireTime();
- if (expireTimes == null){
- pages.getRecords().get(j).setType("0");
- continue;
- }
- //1.获取当前时间
- Date dd = new Date();
- SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String end = sim.format(dd);
- String expireTime = sim.format(expireTimes);
- //把string类型转换为long类型的
-
- if (expireTime != null){
- long st = sim.parse(expireTime).getTime();
- long en = sim.parse(end).getTime();
- //计算天数
- int day = (int) ((st - en) / 86400000);
- if (day <= 30) {
- pages.getRecords().get(j).setType("1");
- } else {
- pages.getRecords().get(j).setType("0");
- }
- }
- }
return R.data(pages);
}
--
Gitblit v1.9.3