|
|
|
@ -131,7 +131,7 @@ public class ExpenseDispatchPriceServiceImpl extends BaseServiceImpl<ExpenseDisp
|
|
|
|
|
if (detail != null) { |
|
|
|
|
BeanUtil.copyProperties(detail, vo); |
|
|
|
|
List<ExpenseDispatchPriceCategoryEntity> list = ExpenseCategoryService.list(Wrappers.<ExpenseDispatchPriceCategoryEntity>lambdaQuery() |
|
|
|
|
.eq(ExpenseDispatchPriceCategoryEntity::getPriceId, expenseDispatchPrice.getId()) |
|
|
|
|
.eq(ExpenseDispatchPriceCategoryEntity::getPriceId, detail.getId()) |
|
|
|
|
.eq(ExpenseDispatchPriceCategoryEntity::getIsDeleted, 0) |
|
|
|
|
); |
|
|
|
|
if(CollUtil.isNotEmpty(list)){ |
|
|
|
@ -159,7 +159,7 @@ public class ExpenseDispatchPriceServiceImpl extends BaseServiceImpl<ExpenseDisp
|
|
|
|
|
}).collect(Collectors.toList())); |
|
|
|
|
} |
|
|
|
|
List<ExpenseDispatchPriceOverZoneEntity> zoneEntities = overZoneService.list(Wrappers.<ExpenseDispatchPriceOverZoneEntity>lambdaQuery() |
|
|
|
|
.eq(ExpenseDispatchPriceOverZoneEntity::getPriceId, expenseDispatchPrice.getId()) |
|
|
|
|
.eq(ExpenseDispatchPriceOverZoneEntity::getPriceId, detail.getId()) |
|
|
|
|
.eq(ExpenseDispatchPriceOverZoneEntity::getIsDeleted, 0) |
|
|
|
|
); |
|
|
|
|
if(CollUtil.isNotEmpty(zoneEntities)){ |
|
|
|
|