|
@@ -663,8 +663,8 @@ public class HotelController extends WebConfig {
|
|
|
.eq(CesStockType::getInvalid, false)
|
|
.eq(CesStockType::getInvalid, false)
|
|
|
.like(CesStockType::getApplyScope, "1"));
|
|
.like(CesStockType::getApplyScope, "1"));
|
|
|
List<CesStockTypeVo> voList = new ArrayList<>();
|
|
List<CesStockTypeVo> voList = new ArrayList<>();
|
|
|
- List<CesStockType> pList = list.stream().filter(t -> StringUtils.isNotBlank(t.getParentId()) && !t.getParentId().equals("0")).collect(Collectors.toList());
|
|
|
|
|
- list.forEach(t -> {
|
|
|
|
|
|
|
+ List<CesStockType> pList = list.stream().filter(t -> StringUtils.isBlank(t.getParentId()) || t.getParentId().equals("0")).collect(Collectors.toList());
|
|
|
|
|
+ pList.forEach(t -> {
|
|
|
CesStockTypeVo vo = new CesStockTypeVo();
|
|
CesStockTypeVo vo = new CesStockTypeVo();
|
|
|
vo.setName(t.getName());
|
|
vo.setName(t.getName());
|
|
|
LambdaQueryWrapper<CesGoods> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<CesGoods> queryWrapper = new LambdaQueryWrapper<>();
|