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

【增强】用户、机构选择器优化

pull/124/head
徐玉祥 2023-06-29 23:36:26 +08:00
parent 43f1137d64
commit 5eb8ed8d1e
4 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java
View File

@ -94,13 +94,61 @@ public interface BizOrgService extends IService<BizOrg> {
List<BizOrg> getAllOrgList();
/**
* 根据机构全名称获取机构id，有则返回，无则创建
* 根据组织全名称获取组织id，有则返回，无则创建
*
* @author xuyuxiang
* @date 2023/3/7 15:44
**/
String getOrgIdByOrgFullNameWithCreate(String orgFullName);
/**
* 根据id获取父子数据列表
*
* @author xuyuxiang
* @date 2022/8/15 14:55
**/
List<BizOrg> getParentAndChildListById(List<BizOrg> originDataList, String id, boolean includeSelf);
/**
* 根据id获取所有的子数据列表
*
* @author xuyuxiang
* @date 2022/8/15 14:55
**/
List<BizOrg> getChildListById(List<BizOrg> originDataList, String id, boolean includeSelf);
/**
* 根据id获取所有的父数据列表
*
* @author xuyuxiang
* @date 2022/8/15 14:55
**/
List<BizOrg> getParentListById(List<BizOrg> originDataList, String id, boolean includeSelf);
/**
* 根据id获取数据
*
* @author xuyuxiang
* @date 2022/8/15 14:55
**/
BizOrg getById(List<BizOrg> originDataList, String id);
/**
* 根据id获取父数据
*
* @author xuyuxiang
* @date 2022/8/15 14:55
**/
BizOrg getParentById(List<BizOrg> originDataList, String id);
/**
* 根据id获取子数据
*
* @author xuyuxiang
* @date 2022/8/15 14:55
**/
BizOrg getChildById(List<BizOrg> originDataList, String id);
/**
* 获取机构树选择器
*

9
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java
View File

@ -389,13 +389,15 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
/* ====以下为各种递归方法==== */
@Override
public List<BizOrg> getParentAndChildListById(List<BizOrg> originDataList, String id, boolean includeSelf) {
List<BizOrg> parentListById = this.getParentListById(originDataList, id, false);
List<BizOrg> childListById = this.getChildListById(originDataList, id, true);
parentListById.addAll(childListById);
return parentListById;
}
@Override
public List<BizOrg> getChildListById(List<BizOrg> originDataList, String id, boolean includeSelf) {
List<BizOrg> resultList = CollectionUtil.newArrayList();
execRecursionFindChild(originDataList, id, resultList);
@ -408,6 +410,7 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
return resultList;
}
@Override
public List<BizOrg> getParentListById(List<BizOrg> originDataList, String id, boolean includeSelf) {
List<BizOrg> resultList = CollectionUtil.newArrayList();
execRecursionFindParent(originDataList, id, resultList);
@ -420,6 +423,7 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
return resultList;
}
public void execRecursionFindChild(List<BizOrg> originDataList, String id, List<BizOrg> resultList) {
originDataList.forEach(item -> {
if(item.getParentId().equals(id)) {
@ -441,16 +445,19 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
});
}
@Override
public BizOrg getById(List<BizOrg> originDataList, String id) {
int index = CollStreamUtil.toList(originDataList, BizOrg::getId).indexOf(id);
return index == -1?null:originDataList.get(index);
}
@Override
public BizOrg getParentById(List<BizOrg> originDataList, String id) {
BizOrg self = this.getById(originDataList, id);
return ObjectUtil.isNotEmpty(self)?self:this.getById(originDataList, self.getParentId());
}
@Override
public BizOrg getChildById(List<BizOrg> originDataList, String id) {
int index = CollStreamUtil.toList(originDataList, BizOrg::getParentId).indexOf(id);
return index == -1?null:originDataList.get(index);

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java
View File

@ -314,11 +314,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
return sysUserService.getAllUserSelectorList();
} else {
if(ObjectUtil.isNotEmpty(sysOrgSelectorUserParam.getOrgId())) {
// 如果组织id不为空，则查询该组织所在顶级组织下的所有人
List<String> parentAndChildOrgIdList = CollStreamUtil.toList(this.getParentAndChildListById(this
// 如果组织id不为空，则查询该组织及其子组织下的所有人
List<String> childOrgIdList = CollStreamUtil.toList(this.getChildListById(this
.getCachedAllOrgList(), sysOrgSelectorUserParam.getOrgId(), true), SysOrg::getId);
if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList);
if (ObjectUtil.isNotEmpty(childOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList);
} else {
return new Page<>();
}

4
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java
View File

@ -463,8 +463,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
// 如果组织id不为空，则查询该组织及其子极其子下的所有人
List<String> childOrgIdList = CollStreamUtil.toList(sysOrgService.getChildListById(sysOrgService
.getCachedAllOrgList(), sysRoleSelectorUserParam.getOrgId(), true), SysOrg::getId);
if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList);
if (ObjectUtil.isNotEmpty(childOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList);
} else {
return new Page<>();
}