Commit 3ffa8923 authored by ZWT's avatar ZWT

得到的

parent ea8ed31a
package pps.core.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageHelper;
......@@ -604,8 +606,7 @@ public class SysDictionaryService {
SysOrganizationDictionaryMapper orgDicmapper = context.getBean(SysOrganizationDictionaryMapper.class);
SysOrganizationRelMapper orgRelMapper = context.getBean(SysOrganizationRelMapper.class);
List<SysDictionaryCache> list = SysDictionaryCache.list(context, input.getAlias());
SysDictionaryEnt sysDictionaryEnt = mapper.selectOne(new QueryWrapper<SysDictionaryEnt>()
.lambda()
SysDictionaryEnt sysDictionaryEnt = mapper.selectOne(new LambdaQueryWrapper<SysDictionaryEnt>()
.eq(SysDictionaryEnt::getAlias, input.getAlias())
.gt(SysDictionaryEnt::getEndTime, new Date()));
list = list.stream().filter((SysDictionaryCache dic) -> CharSequenceUtil.equals(dic.getPid(), sysDictionaryEnt.getId()))
......@@ -613,8 +614,7 @@ public class SysDictionaryService {
if (CollUtil.isEmpty(list)) {
list = SysDictionaryCache.list(context, input.getAlias());
//查询alias字典
SysDictionaryEnt sysDictionary = mapper.selectOne(new QueryWrapper<SysDictionaryEnt>()
.lambda()
SysDictionaryEnt sysDictionary = mapper.selectOne(new LambdaQueryWrapper<SysDictionaryEnt>()
.eq(SysDictionaryEnt::getAlias, input.getAlias())
.gt(SysDictionaryEnt::getEndTime, new Date()));
if (ObjectUtil.isNotNull(sysDictionary)) {
......@@ -675,41 +675,8 @@ public class SysDictionaryService {
}
}
}
if (ObjectUtil.isNotNull(sysDictionaryEnt.getIsOrg()) && sysDictionaryEnt.getIsOrg() == 1) {
//查询当前登录人的组织机构层级路径
SysOrganizationRelEnt sysOrganizationRelEnt = orgRelMapper.selectOne(new QueryWrapper<SysOrganizationRelEnt>()
.lambda()
.eq(SysOrganizationRelEnt::getOuId, input.getOuId())
.gt(SysOrganizationRelEnt::getEndTime, new Date()));
//根据字典id查询
List<SysOrganizationDictionaryEnt> sysOrganizationDictionaryEnts = orgDicmapper.selectList(new QueryWrapper<SysOrganizationDictionaryEnt>()
.lambda()
.eq(SysOrganizationDictionaryEnt::getParentDicCode, sysDictionaryEnt.getId())
.gt(SysOrganizationDictionaryEnt::getEndTime, new Date()));
String ouIdPath = sysOrganizationRelEnt.getOuIdPath();
String ouId = sysOrganizationRelEnt.getOuId();
if (CharSequenceUtil.isNotBlank(ouIdPath)) {
List<String> dicIds = sysOrganizationDictionaryEnts.stream().map(p -> {
if (CharSequenceUtil.contains(ouIdPath, p.getOuId()) && p.getUseLowerLevel() == 1) {
return p.getDicCode();
} else if (CharSequenceUtil.contains(ouId, p.getOuId())) {
return p.getDicCode();
} else {
return "1";
}
}).collect(Collectors.toList());
list = list.stream().filter(i -> dicIds.contains(i.getId())).collect(Collectors.toList());
}
}
list.sort((o1, o2) -> {
if (ObjectUtil.isAllNotEmpty(o1.getSort(), o2.getSort())) {
return o1.getSort() - o2.getSort();
} else {
return 0;
}
});
List<QuerySysDictionaryViewOutput> outputs = XCopyUtils.copyNewList(list, QuerySysDictionaryViewOutput.class);
return XListResult.success(outputs);
list.sort(Comparator.comparing(SysDictionaryCache::getSort));
return XListResult.success(BeanUtil.copyToList(list, QuerySysDictionaryViewOutput.class));
}
@XText("获取字典地区树")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment