Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
cac9eeb975
|
|
@ -64,7 +64,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
||||||
optionalInfo.ifPresent(info -> {
|
optionalInfo.ifPresent(info -> {
|
||||||
leaseApplyRequestVo.setLeaseApplyInfo(info);
|
leaseApplyRequestVo.setLeaseApplyInfo(info);
|
||||||
// 获取领料单详情
|
// 获取领料单详情
|
||||||
List<LeaseApplyDetails> details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(id));
|
List<LeaseApplyDetails> details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getTaskId()));
|
||||||
if (!CollectionUtils.isEmpty(details)) {
|
if (!CollectionUtils.isEmpty(details)) {
|
||||||
leaseApplyRequestVo.setLeaseApplyDetailsList(details);
|
leaseApplyRequestVo.setLeaseApplyDetailsList(details);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue