[init]创建能辉erp 系统

2 years ago · ca9ed9bc0e
parent 168c2dde00
commit ca9ed9bc0e
1 changed files with 4 additions and 1 deletions
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/OrderController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/OrderController.java
@ -92,7 +92,10 @@ public class OrderController {
 		pageList.getRecords().forEach(e ->{
 			OrderExt orderExt = new OrderExt();
 			BeanUtils.copyProperties(e,orderExt);
-			orderExt.setOrderDetailList(orderDetailExtMap.get(e.getId()));
+			if(null != orderDetailExtMap
+					&& null != orderDetailExtMap.get(e.getId())){
+				orderExt.setOrderDetailList(orderDetailExtMap.get(e.getId()));
+			}
 			records.add(orderExt);
 		});
 		pageExt.setRecords(records);