|
@@ -153,7 +153,8 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
|
|
|
List<String> dictcodes = new ArrayList<>();
|
|
|
|
|
|
// 提取现有数据
|
|
|
- oldSysProduct = productService.lambdaQuery().eq(Product::getProductBrandId, brandRec.getBrandId()).list();
|
|
|
+ oldSysProduct = productService.lambdaQuery()
|
|
|
+ .eq(Product::getProductBrandId, brandRec.getBrandId()).list();
|
|
|
if (CollectionUtils.isNotEmpty(oldSysProduct)){
|
|
|
oldProductRecMap = oldSysProduct.stream().collect(Collectors.groupingBy(Product::getProductId));
|
|
|
}
|
|
@@ -1108,7 +1109,8 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
|
|
|
List<String> xiids = new ArrayList<>();
|
|
|
|
|
|
// 提取系列字典数据 sysDictService
|
|
|
- oldSysDictRec = sysDictService.lambdaQuery().eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_SERIES.getCode()).list();
|
|
|
+ oldSysDictRec = sysDictService.lambdaQuery()
|
|
|
+ .eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_SERIES.getCode()).list();
|
|
|
if (CollectionUtils.isNotEmpty(oldSysDictRec)){
|
|
|
oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
|
|
|
}
|
|
@@ -1675,7 +1677,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
|
|
|
// 提取大类字典数据 sysDictService
|
|
|
oldSysDictRec = sysDictService.lambdaQuery()
|
|
|
.eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
|
|
|
- .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode()).list();
|
|
|
+ .list();
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(oldSysDictRec)){
|
|
|
oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
|
|
@@ -1849,7 +1851,8 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
|
|
|
List<String> dictcodes = new ArrayList<>();
|
|
|
|
|
|
// 提取字典对应关系
|
|
|
- List<SysDictRef> oldSysDictRefRec = sysDictRefService.lambdaQuery().eq(SysDictRef::getBrandId, brandRec.getBrandId())
|
|
|
+ List<SysDictRef> oldSysDictRefRec = sysDictRefService.lambdaQuery()
|
|
|
+ .eq(SysDictRef::getBrandId, brandRec.getBrandId())
|
|
|
.eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode()).list();
|
|
|
Map<String, List<SysDictRef>> oldSysDictRefRecMap = oldSysDictRefRec.stream().collect(Collectors.groupingBy(SysDictRef::getDictCode));
|
|
|
|