|
|
@@ -137,30 +137,44 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
|
|
|
.eq(SmsbDepartmentDO::getTenant, tenant)
|
|
|
.isNull(SmsbDepartmentDO::getParentId));
|
|
|
List<SmsbDepartmentCO> departmentTree = Lists.newArrayList();
|
|
|
- departmentList.forEach(department->{
|
|
|
+ departmentList.forEach(department -> {
|
|
|
SmsbDepartmentCO smsbDepartmentCO = new SmsbDepartmentCO();
|
|
|
- BeanUtils.copyProperties(department , smsbDepartmentCO);
|
|
|
+ BeanUtils.copyProperties(department, smsbDepartmentCO);
|
|
|
smsbDepartmentCO.setChildren(this.getChilde(department.getId()));
|
|
|
departmentTree.add(smsbDepartmentCO);
|
|
|
});
|
|
|
- log.info("tree num is :{}",departmentTree.size());
|
|
|
+ log.info("tree num is :{}", departmentTree.size());
|
|
|
return SingleResponse.of(departmentTree);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<SmsbDepartmentCO> queryDepartmentListNoHierarchy(String tenant) {
|
|
|
+ List<SmsbDepartmentDO> departmentList = super.list(new LambdaQueryWrapper<>(SmsbDepartmentDO.class)
|
|
|
+ .eq(SmsbDepartmentDO::getIsDel, 0)
|
|
|
+ .eq(SmsbDepartmentDO::getTenant, tenant));
|
|
|
+ List<SmsbDepartmentCO> result = Lists.newArrayList();
|
|
|
+ departmentList.forEach(department -> {
|
|
|
+ SmsbDepartmentCO smsbDepartmentCO = new SmsbDepartmentCO();
|
|
|
+ BeanUtils.copyProperties(department, smsbDepartmentCO);
|
|
|
+ result.add(smsbDepartmentCO);
|
|
|
+ });
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public PageResponse<SmsbSimpleUserCO> queryDepartmentUserList(SmsbDepartmentCmd departmentCmd) {
|
|
|
- return departmentUserService.queryUserPageByDeprIds(departmentCmd ,
|
|
|
+ return departmentUserService.queryUserPageByDeprIds(departmentCmd,
|
|
|
Objects.nonNull(departmentCmd.getDepartmentId()) ? super.getById(departmentCmd.getDepartmentId()).getPath() : null);
|
|
|
}
|
|
|
|
|
|
- private List<SmsbDepartmentCO> getChilde(Long id){
|
|
|
+ private List<SmsbDepartmentCO> getChilde(Long id) {
|
|
|
List<SmsbDepartmentDO> childList = this.list(new LambdaQueryWrapper<>(SmsbDepartmentDO.class)
|
|
|
- .eq(SmsbDepartmentDO::getIsDel ,0)
|
|
|
+ .eq(SmsbDepartmentDO::getIsDel, 0)
|
|
|
.eq(SmsbDepartmentDO::getParentId, id));
|
|
|
List<SmsbDepartmentCO> finalChilds = Lists.newArrayList();
|
|
|
- childList.forEach(child ->{
|
|
|
+ childList.forEach(child -> {
|
|
|
SmsbDepartmentCO smsbDepartmentCO = new SmsbDepartmentCO();
|
|
|
- BeanUtils.copyProperties(child , smsbDepartmentCO);
|
|
|
+ BeanUtils.copyProperties(child, smsbDepartmentCO);
|
|
|
smsbDepartmentCO.setChildren(this.getChilde(child.getId()));
|
|
|
finalChilds.add(smsbDepartmentCO);
|
|
|
});
|