From 9b208eb3947358169df8f46472a246eb6ea8ca32 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 十二月 2023 17:08:09 +0800
Subject: [PATCH] 工作通知
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index e151ebd..5da93ed 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -141,7 +141,7 @@
date = calendar.getTime();
umsAdmin.setExpirationDate(date);
} else {
- umsAdmin.setExpirationDate(new Date(2090,1,1));
+ umsAdmin.setExpirationDate(new Date(2090, 1, 1));
}
if (umsAdmin.getId() != null) {
baseMapper.updateById(umsAdmin);
@@ -298,7 +298,7 @@
}
return token;
}
-
+
@Override
public String getOAuthToken(String username) {
String token = null;
@@ -587,23 +587,10 @@
@Override
public List<UmsAdmin> getDepartUser(Long departId) {
- //TODO锛氭煡璇簩绾ч儴闂ㄥ強鎵�鏈夊瓙绾ч儴闂�
- List<UmsDepart> umsDeparts = umsDepartManageMapper.selectChildrendIds(departId);
- List<Long> parentIds = umsDeparts.stream().map(UmsDepart::getParentId).collect(Collectors.toList());
- List<Long> ids = umsDeparts.stream().map(UmsDepart::getId).collect(Collectors.toList());
- List<Long> departIds = new ArrayList<>();
- for (Long id : ids) {
- if(!parentIds.contains(id)){
- departIds.add(id);
- }
- }
-
QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
- wrapper.lambda().in(UmsDepartManage::getDepartId, departIds);
- List<UmsDepartManage> users = umsDepartManageMapper.selectList(wrapper);
-
- List<Long> userIds = users.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
-
+ wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
+ List<UmsDepartManage> list = umsDepartManageMapper.selectList(wrapper);
+ List<Long> userIds = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
wrapperUser.in("id", userIds);
List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
--
Gitblit v1.8.0