|
@@ -39,6 +39,9 @@ public class PsiMaterialTypeService extends ServiceImpl<PsiMaterialTypeMapper, P
|
|
|
List<PsiMaterialTypeInfo> materialTypeInfoList = this.list(new QueryWrapper<PsiMaterialTypeInfo>().lambda()
|
|
List<PsiMaterialTypeInfo> materialTypeInfoList = this.list(new QueryWrapper<PsiMaterialTypeInfo>().lambda()
|
|
|
.like(StringUtils.isNotBlank(info.getName()), PsiMaterialTypeInfo::getName, info.getName())
|
|
.like(StringUtils.isNotBlank(info.getName()), PsiMaterialTypeInfo::getName, info.getName())
|
|
|
);
|
|
);
|
|
|
|
|
+ if (CollectionUtil.isEmpty(materialTypeInfoList)) {
|
|
|
|
|
+ return new ArrayList<>();
|
|
|
|
|
+ }
|
|
|
List<String> collect = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getId).collect(Collectors.toList());
|
|
List<String> collect = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getId).collect(Collectors.toList());
|
|
|
//materialTypeInfoList的父级id全部获取
|
|
//materialTypeInfoList的父级id全部获取
|
|
|
List<String> cupIdList = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getParentId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
|
|
List<String> cupIdList = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getParentId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
|
|
@@ -127,6 +130,9 @@ public class PsiMaterialTypeService extends ServiceImpl<PsiMaterialTypeMapper, P
|
|
|
List<PsiMaterialTypeInfo> materialTypeInfoList = this.list(new QueryWrapper<PsiMaterialTypeInfo>().lambda()
|
|
List<PsiMaterialTypeInfo> materialTypeInfoList = this.list(new QueryWrapper<PsiMaterialTypeInfo>().lambda()
|
|
|
.like(StringUtils.isNotBlank(info.getName()), PsiMaterialTypeInfo::getName, info.getName())
|
|
.like(StringUtils.isNotBlank(info.getName()), PsiMaterialTypeInfo::getName, info.getName())
|
|
|
);
|
|
);
|
|
|
|
|
+ if (CollectionUtil.isEmpty(materialTypeInfoList)) {
|
|
|
|
|
+ return new ArrayList<>();
|
|
|
|
|
+ }
|
|
|
List<String> collect = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getId).collect(Collectors.toList());
|
|
List<String> collect = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getId).collect(Collectors.toList());
|
|
|
//materialTypeInfoList的父级id全部获取
|
|
//materialTypeInfoList的父级id全部获取
|
|
|
List<String> cupIdList = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getParentId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
|
|
List<String> cupIdList = materialTypeInfoList.stream().map(PsiMaterialTypeInfo::getParentId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
|