Commit 36ee09ba by liyanlin

fix

parent d89cc90d
...@@ -825,13 +825,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -825,13 +825,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
.map(ScheduleServe::getServeId) .map(ScheduleServe::getServeId)
.collect(Collectors.toList()))) .collect(Collectors.toList())))
.stream() .stream()
.collect(Collectors.toMap(BaseServe::getId,a -> a,(k1,k2) -> k1)); .collect(Collectors.toMap(BaseServe::getId, a -> a, (k1, k2) -> k1));
scheduleServeList.forEach(scheduleServe -> { scheduleServeList.forEach(scheduleServe -> {
if (scheduleServe.getOwnProduceId() != null) { if (scheduleServe.getOwnProduceId() != null) {
scheduleServe.setOwnProduce(ownProduceMap.get(scheduleServe.getOwnProduceId())); scheduleServe.setOwnProduce(ownProduceMap.get(scheduleServe.getOwnProduceId()));
} }
if(scheduleServe.getServeId() != null){ if (scheduleServe.getServeId() != null) {
scheduleServe.setServe(baseServeMap.get(scheduleServe.getServeId())); scheduleServe.setServe(baseServeMap.get(scheduleServe.getServeId()));
} }
}); });
......
...@@ -138,11 +138,11 @@ public class OrderManageController { ...@@ -138,11 +138,11 @@ public class OrderManageController {
@PostMapping("/technician/ordermanage/selectBySkuName") @PostMapping("/technician/ordermanage/selectBySkuName")
public JsonResult<PurchaseSku> selectBySkuName(String skuName, @RequestHeader("brandId") Integer brandId) { public JsonResult<PurchaseSku> selectBySkuName(String skuName, @RequestHeader("brandId") Integer brandId) {
PurchaseSku purchaseSku = purchaseSkuMapper PurchaseSku purchaseSku = purchaseSkuMapper
.selectOne( .selectList(
new LambdaQueryWrapper<PurchaseSku>() new LambdaQueryWrapper<PurchaseSku>()
.like(PurchaseSku::getSkuName, skuName) .like(PurchaseSku::getSkuName, skuName)
.eq(PurchaseSku::getBrandId, brandId) .eq(PurchaseSku::getBrandId, brandId)
); ).stream().findFirst().orElseGet(PurchaseSku::new);
return JsonResult.success(purchaseSku); return JsonResult.success(purchaseSku);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment