gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化代码

pull/61/MERGE
awenes 2023-09-28 20:50:20 +08:00
parent 8699bcfccc
commit 2efef4825d
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java
View File

@ -22,8 +22,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import cn.topiam.employee.common.entity.app.AppEntity;
import cn.topiam.employee.common.repository.app.impl.mapper.AppEntityMapper;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@ -171,10 +169,10 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto
List<Object> list = Lists.newArrayList(); List<Object> list = Lists.newArrayList();
//当前用户加入的用户组Id //当前用户加入的用户组Id
List<Long> groupIdList = userGroupMemberRepository.findByUserId(userId).stream() List<Long> groupIdList = userGroupMemberRepository.findByUserId(userId).stream()
.map(UserGroupMemberEntity::getGroupId).toList(); .map(UserGroupMemberEntity::getGroupId).toList();
//当前用户加入的组织id //当前用户加入的组织id
List<String> orgId = organizationMemberRepository.findAllByUserId(userId).stream() List<String> orgId = organizationMemberRepository.findAllByUserId(userId).stream()
.map(OrganizationMemberEntity::getOrgId).toList(); .map(OrganizationMemberEntity::getOrgId).toList();
list.addAll(groupIdList); list.addAll(groupIdList);
list.addAll(orgId); list.addAll(orgId);
list.add(userId); list.add(userId);

4
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java
View File

@ -159,10 +159,10 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
List<Object> list = Lists.newArrayList(); List<Object> list = Lists.newArrayList();
//当前用户加入的用户组Id //当前用户加入的用户组Id
List<Long> groupIdList = userGroupMemberRepository.findByUserId(userId).stream() List<Long> groupIdList = userGroupMemberRepository.findByUserId(userId).stream()
.map(UserGroupMemberEntity::getGroupId).toList(); .map(UserGroupMemberEntity::getGroupId).toList();
//当前用户加入的组织id //当前用户加入的组织id
List<String> orgId = organizationMemberRepository.findAllByUserId(userId).stream() List<String> orgId = organizationMemberRepository.findAllByUserId(userId).stream()
.map(OrganizationMemberEntity::getOrgId).toList(); .map(OrganizationMemberEntity::getOrgId).toList();
list.addAll(groupIdList); list.addAll(groupIdList);
list.addAll(orgId); list.addAll(orgId);
list.add(userId); list.add(userId);

2
eiam-console/src/main/java/cn/topiam/employee/console/service/app/impl/AppServiceImpl.java
View File

@ -256,7 +256,7 @@ public class AppServiceImpl implements AppService {
private final AppConverter appConverter; private final AppConverter appConverter;
/** /**
* AppGroupAssociationRepositorys * AppGroupAssociationRepository
*/ */
private final AppGroupAssociationRepository appGroupAssociationRepository; private final AppGroupAssociationRepository appGroupAssociationRepository;
} }