【更新】更改获取所有机构方法

pull/150/head
xiaonuobase 2023-08-11 19:08:47 +08:00
parent c62778a0d2
commit 42f3979bc5
5 changed files with 15 additions and 15 deletions

View File

@ -91,7 +91,7 @@ public interface SysOrgService extends IService<SysOrg> {
* @author xuyuxiang
* @date 2022/7/25 19:42
**/
List<SysOrg> getCachedAllOrgList();
List<SysOrg> getAllOrgList();
/**
* id

View File

@ -99,7 +99,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
@Override
public List<Tree<String>> tree() {
List<SysOrg> sysOrgList = this.getCachedAllOrgList();
List<SysOrg> sysOrgList = this.getAllOrgList();
List<TreeNode<String>> treeNodeList = sysOrgList.stream().map(sysOrg ->
new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(),
sysOrg.getName(), sysOrg.getSortCode()).setExtra(JSONUtil.parseObj(sysOrg)))
@ -136,7 +136,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
if(repeatName) {
throw new CommonException("存在重复的同级组织,名称为:{}", sysOrg.getName());
}
List<SysOrg> originDataList = this.getCachedAllOrgList();
List<SysOrg> originDataList = this.getAllOrgList();
boolean errorLevel = this.getChildListById(originDataList, sysOrg.getId(), true).stream()
.map(SysOrg::getId).collect(Collectors.toList()).contains(sysOrg.getParentId());
if(errorLevel) {
@ -153,7 +153,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
public void delete(List<SysOrgIdParam> sysOrgIdParamList) {
List<String> orgIdList = CollStreamUtil.toList(sysOrgIdParamList, SysOrgIdParam::getId);
if(ObjectUtil.isNotEmpty(orgIdList)) {
List<SysOrg> allOrgList = this.getCachedAllOrgList();
List<SysOrg> allOrgList = this.getAllOrgList();
// 获取所有子组织
List<String> toDeleteOrgIdList = CollectionUtil.newArrayList();
orgIdList.forEach(orgId -> toDeleteOrgIdList.addAll(this.getChildListById(allOrgList, orgId, true).stream()
@ -209,7 +209,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
}
@Override
public List<SysOrg> getCachedAllOrgList() {
public List<SysOrg> getAllOrgList() {
// 从缓存中取
Object cacheValue = commonCacheOperator.get(ORG_CACHE_ALL_KEY);
if(ObjectUtil.isNotEmpty(cacheValue)) {
@ -225,7 +225,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
@Override
public String getOrgIdByOrgFullNameWithCreate(String orgFullName) {
List<SysOrg> cachedAllOrgList = this.getCachedAllOrgList();
List<SysOrg> cachedAllOrgList = this.getAllOrgList();
List<Tree<String>> treeList = TreeUtil.build(cachedAllOrgList.stream().map(sysOrg ->
new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(), sysOrg.getName(), sysOrg.getSortCode()))
.collect(Collectors.toList()), "0");
@ -280,7 +280,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
@Override
public List<Tree<String>> orgTreeSelector() {
List<SysOrg> sysOrgList = this.getCachedAllOrgList();
List<SysOrg> sysOrgList = this.getAllOrgList();
List<TreeNode<String>> treeNodeList = sysOrgList.stream().map(sysOrg ->
new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(), sysOrg.getName(), sysOrg.getSortCode()))
.collect(Collectors.toList());
@ -316,7 +316,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
if(ObjectUtil.isNotEmpty(sysOrgSelectorUserParam.getOrgId())) {
// 如果组织id不为空则查询该组织及其子组织下的所有人
List<String> childOrgIdList = CollStreamUtil.toList(this.getChildListById(this
.getCachedAllOrgList(), sysOrgSelectorUserParam.getOrgId(), true), SysOrg::getId);
.getAllOrgList(), sysOrgSelectorUserParam.getOrgId(), true), SysOrg::getId);
if (ObjectUtil.isNotEmpty(childOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList);
} else {

View File

@ -195,7 +195,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
@Override
public List<Tree<String>> orgTreeSelector() {
List<SysOrg> sysOrgList = sysOrgService.getCachedAllOrgList();
List<SysOrg> sysOrgList = sysOrgService.getAllOrgList();
List<TreeNode<String>> treeNodeList = sysOrgList.stream().map(sysOrg ->
new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(), sysOrg.getName(), sysOrg.getSortCode()))
.collect(Collectors.toList());

View File

@ -319,7 +319,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override
public List<Tree<String>> orgTreeSelector() {
List<SysOrg> sysOrgList = sysOrgService.getCachedAllOrgList();
List<SysOrg> sysOrgList = sysOrgService.getAllOrgList();
List<TreeNode<String>> treeNodeList = sysOrgList.stream().map(sysOrg ->
new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(), sysOrg.getName(), sysOrg.getSortCode()))
.collect(Collectors.toList());
@ -468,7 +468,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
if (ObjectUtil.isNotEmpty(sysRoleSelectorUserParam.getOrgId())) {
// 如果组织id不为空则查询该组织及其子极其子下的所有人
List<String> childOrgIdList = CollStreamUtil.toList(sysOrgService.getChildListById(sysOrgService
.getCachedAllOrgList(), sysRoleSelectorUserParam.getOrgId(), true), SysOrg::getId);
.getAllOrgList(), sysRoleSelectorUserParam.getOrgId(), true), SysOrg::getId);
if (ObjectUtil.isNotEmpty(childOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList);
} else {

View File

@ -966,7 +966,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public List<JSONObject> getScopeListByMap(Map<String, List<SysRelation>> groupMap, String orgId) {
List<JSONObject> resultList = CollectionUtil.newArrayList();
List<SysOrg> sysOrgList = sysOrgService.getCachedAllOrgList();
List<SysOrg> sysOrgList = sysOrgService.getAllOrgList();
List<String> scopeAllList = sysOrgList.stream().map(SysOrg::getId).collect(Collectors.toList());
List<String> scopeOrgList = CollectionUtil.newArrayList(orgId);
List<String> scopeOrgChildList = sysOrgService.getChildListById(sysOrgList, orgId, true)
@ -1363,7 +1363,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public List<SysUserPositionResult> loginPositionInfo(SysUserIdParam sysUserIdParam) {
SysUser sysUser = this.queryEntity(sysUserIdParam.getId());
List<SysUserPositionResult> sysUserPositionResultList = CollectionUtil.newArrayList();
List<SysOrg> sysOrgList = sysOrgService.getCachedAllOrgList();
List<SysOrg> sysOrgList = sysOrgService.getAllOrgList();
String primaryOrgId = sysUser.getOrgId();
SysOrg primarySysOrg = sysOrgService.getById(sysOrgList, primaryOrgId);
if (ObjectUtil.isEmpty(primarySysOrg)) {
@ -1432,7 +1432,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<Tree<String>> orgTreeSelector() {
List<SysOrg> sysOrgList = sysOrgService.getCachedAllOrgList();
List<SysOrg> sysOrgList = sysOrgService.getAllOrgList();
List<TreeNode<String>> treeNodeList = sysOrgList.stream().map(sysOrg ->
new TreeNode<>(sysOrg.getId(), sysOrg.getParentId(), sysOrg.getName(), sysOrg.getSortCode()))
.collect(Collectors.toList());
@ -1502,7 +1502,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) {
// 如果组织id不为空则查询该组织及其子组织下的所有人
List<String> childOrgIdList = CollStreamUtil.toList(sysOrgService.getChildListById(sysOrgService
.getCachedAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId);
.getAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId);
if (ObjectUtil.isNotEmpty(childOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList);
} else {