Skip to content

A
amos-boot-biz
Commit 27129983 authored by chenhao's avatar chenhao
Browse files
Options

修改部门-人树信息

parent 9e53dff7
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 24 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
View file @ 27129983
...@@ -477,39 +477,45 @@ public class MaintenanceCompanyServiceImpl ...@@ -477,39 +477,45 @@ public class MaintenanceCompanyServiceImpl
@Override @Override
public List<MaintenanceCompany> getDepartmentAndPersonTree(long sequenceNbr) { public List<MaintenanceCompany> getDepartmentAndPersonTree(long sequenceNbr) {
List<MaintenanceCompany> departmentAllList =new ArrayList<MaintenanceCompany>(); // List<MaintenanceCompany> departmentAllList =new ArrayList<MaintenanceCompany>();
List<MaintenanceCompany> departmentList= getDepartmentList(sequenceNbr); List<MaintenanceCompany> departmentList= getDepartmentList(sequenceNbr);
departmentAllList.addAll(departmentList); //departmentAllList.addAll(departmentList);
departmentAllList = getDepartmentAllList(departmentAllList,departmentList); // departmentAllList = getDepartmentAllList(departmentAllList,departmentList);
for (MaintenanceCompany map : departmentList) { // for (MaintenanceCompany map : departmentList) {
Long departmentSequenceNbr=map.getSequenceNbr(); // Long departmentSequenceNbr=map.getSequenceNbr();
departmentAllList.addAll(getPersonList(departmentSequenceNbr)); // departmentAllList.addAll(getPersonList(departmentSequenceNbr));
} // }
if (departmentAllList == null) { // if (departmentAllList == null) {
return new ArrayList<>(); // return new ArrayList<>();
} // }
departmentAllList = departmentAllList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList()); // departmentAllList = departmentAllList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
return departmentAllList; // return departmentAllList;
if (departmentList == null) {
return new ArrayList<>();
} }
public List<MaintenanceCompany> getDepartmentAllList(List<MaintenanceCompany> departmentAllList,List<MaintenanceCompany> departmentList){ return departmentList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
for (MaintenanceCompany map : departmentList) {
long chrildSequenceNbr=map.getSequenceNbr();
List<MaintenanceCompany> chrlidList= getDepartmentList(chrildSequenceNbr);
if(chrlidList.size()>0) {
departmentAllList.addAll(chrlidList);
getDepartmentAllList(departmentAllList,chrlidList);
}
}
return departmentAllList;
} }
// public List<MaintenanceCompany> getDepartmentAllList(List<MaintenanceCompany> departmentAllList,List<MaintenanceCompany> departmentList){
// for (MaintenanceCompany map : departmentList) {
// long chrildSequenceNbr=map.getSequenceNbr();
// List<MaintenanceCompany> chrlidList= getDepartmentList(chrildSequenceNbr);
// if(chrlidList.size()>0) {
// departmentAllList.addAll(chrlidList);
// getDepartmentAllList(departmentAllList,chrlidList);
// }
// }
// return departmentAllList;
// }
@Override @Override
public List<MaintenanceCompany> getDepartmentList(long sequenceNbr) { public List<MaintenanceCompany> getDepartmentList(long sequenceNbr) {
MaintenanceCompany companyDetail= maintenanceCompanyMapper.selectById(sequenceNbr);
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
wrapper.select(MaintenanceCompany::getSequenceNbr,MaintenanceCompany::getName,MaintenanceCompany::getCode,MaintenanceCompany::getType,MaintenanceCompany::getBizCode,MaintenanceCompany::getParentId); wrapper.select(MaintenanceCompany::getSequenceNbr,MaintenanceCompany::getName,MaintenanceCompany::getCode,MaintenanceCompany::getType,MaintenanceCompany::getBizCode,MaintenanceCompany::getParentId);
wrapper.eq(MaintenanceCompany::getIsDelete, false); wrapper.eq(MaintenanceCompany::getIsDelete, false);
wrapper.eq(MaintenanceCompany::getType, DEPARTMENT); wrapper.in(MaintenanceCompany::getType, Arrays.asList(PERSON,DEPARTMENT));
wrapper.eq(MaintenanceCompany::getParentId, sequenceNbr); wrapper.likeRight(MaintenanceCompany::getCode, companyDetail.getCode());
List<MaintenanceCompany> ss= maintenanceCompanyMapper.selectList(wrapper);
return maintenanceCompanyMapper.selectList(wrapper); return maintenanceCompanyMapper.selectList(wrapper);
} }
......
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