|
|
@@ -553,15 +553,13 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<String> queryPathByTenantAndName(List<String> nameList, String tenant) {
|
|
|
- return this.lambdaQuery()
|
|
|
+ public List<SmsbDepartmentCO> queryByTenantAndName(List<String> nameList, String tenant) {
|
|
|
+ List<SmsbDepartmentDO> doList = this.lambdaQuery()
|
|
|
.eq(SmsbDepartmentDO::getIsDel, 0)
|
|
|
.eq(Objects.nonNull(tenant), SmsbDepartmentDO::getTenant, tenant)
|
|
|
.in(!CollectionUtils.isEmpty(nameList), SmsbDepartmentDO::getName, nameList)
|
|
|
- .list()
|
|
|
- .stream()
|
|
|
- .map(SmsbDepartmentDO::getPath)
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .list();
|
|
|
+ return BeanCopyUtils.copyList(doList, SmsbDepartmentCO.class);
|
|
|
}
|
|
|
|
|
|
/**
|