bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-12-17 21:24:26 +08:00
parent 05e1f46af3 06ff503f87
commit 3e8599ddf4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -338,8 +338,8 @@ public class OrderController extends BaseController {
replacements.put("orderTable", orderDetail); replacements.put("orderTable", orderDetail);
BmContract bmContract = new BmContract(); BmContract bmContract = new BmContract();
bmContract = bmContractService.getContract(bmContract);
bmContract.setCompanyId(orderInfoDto.getCompanyId()); bmContract.setCompanyId(orderInfoDto.getCompanyId());
bmContract = bmContractService.getContract(bmContract);
if (bmContract == null || StringUtils.isBlank(bmContract.getContent())) { if (bmContract == null || StringUtils.isBlank(bmContract.getContent())) {
bmContract = new BmContract(); bmContract = new BmContract();
bmContract.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent()); bmContract.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent());