diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index d459e2c..9096d8c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -378,13 +378,13 @@ public class OrderController extends BaseController { replacements.put("orderTable", orderDetail); BmContract bmContract = new BmContract(); - - BmContract bmContracts = bmContractService.getContract(bmContract); - if (StringUtils.isBlank(bmContracts.getContent())) { - bmContracts.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent()); + bmContract = bmContractService.getContract(bmContract); + if (bmContract == null || StringUtils.isBlank(bmContract.getContent())) { + bmContract = new BmContract(); + bmContract.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent()); } StrSubstitutor sub = new StrSubstitutor(replacements); - String result = sub.replace(bmContracts.getContent()); + String result = sub.replace(bmContract.getContent()); return AjaxResult.success(result); } else { return AjaxResult.error("参数错误"); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index 445bd51..4b5a661 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select content from bm_book_contract limit 1 \ No newline at end of file