diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java index 5fc3dc9..984fa64 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java @@ -74,14 +74,18 @@ public class OrderDetailsController extends BaseController { OrderDetailsVo orderDetails = orderDetailsService.selectOrderDetailsById(id); Map map1 = (Map) equipClient.getInfo(orderDetails.getMaId()); - Map map2 = (Map) map1.get(DATA_TAG); - String typeName = (String) map2.get("typeName"); - String groupName = (String) map2.get("groupName"); - String modelName = (String) map2.get("modelName"); - String deviceName = (String) map2.get("deviceName"); - orderDetails.setTypeName(typeName); - orderDetails.setGroupName(groupName); - orderDetails.setDeviceName(modelName+deviceName); + if (map1 != null) { + Map map2 = (Map) map1.get(DATA_TAG); + if (map2 != null) { + String typeName = (String) map2.get("typeName"); + String groupName = (String) map2.get("groupName"); + String modelName = (String) map2.get("modelName"); + String deviceName = (String) map2.get("deviceName"); + orderDetails.setTypeName(typeName); + orderDetails.setGroupName(groupName); + orderDetails.setDeviceName(modelName + deviceName); + } + } return success(orderDetails); }