From 27421a34661fed2e141ab9aaa7447926aea46e36 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:09:25 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
index 3af736a..8f3b60a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
+++ b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
@@ -18,7 +18,6 @@
import javax.annotation.Resource;
import java.util.List;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -73,10 +72,11 @@
}catch (Exception e){
throw new ErrorException(e.getMessage());
}
- return companies.stream().filter(ob->{
+ /*return companies.stream().filter(ob->{
if(ob.getStatus().equals("enabled")) return true;
return false;
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
+ return companies;
}
public List<Person> userUrl(String companyId) {
@@ -91,11 +91,8 @@
throw new ErrorException(e.getMessage());
}
return person.stream().filter(ob->{
- if(Objects.equals(ob.getStatus(), "enabled")) {
- ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
- return true;
- }
- return false;
+ ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
+ return true;
}).collect(Collectors.toList());
}
--
Gitblit v1.9.3