矿山域-流程管理

business-modules/business-usual-transport/src/main/java/com/sckw/usual/service/OrderActionService.java

@@ -119,10 +119,18 @@ public class OrderActionService {
             }
 
             kwOrders.forEach(e -> {
-                e.setStatusStr(statusMap.getOrDefault(e.getStatus().toString(), ""));
-                e.setTypeHandlingStr(typeHandlingMap.getOrDefault(e.getTypeHandling().toString(), ""));
-                e.setOrderSourceStr(orderSourceMap.getOrDefault(e.getOrderSource().toString(), ""));
-                e.setGoodsTypeStr(goodsMap.getOrDefault(e.getGoodsType().toString(), ""));
+                if (ObjectUtils.isNotNull(e.getStatus())) {
+                    e.setStatusStr(statusMap.getOrDefault(e.getStatus().toString(), ""));
+                }
+                if (ObjectUtils.isNotNull(e.getTypeHandling())) {
+                    e.setTypeHandlingStr(statusMap.getOrDefault(e.getTypeHandling().toString(), ""));
+                }
+                if (ObjectUtils.isNotNull(e.getOrderSource())) {
+                    e.setOrderSourceStr(statusMap.getOrDefault(e.getOrderSource().toString(), ""));
+                }
+                if (ObjectUtils.isNotNull(e.getGoodsType())) {
+                    e.setGoodsTypeStr(goodsMap.getOrDefault(e.getGoodsType().toString(), ""));
+                }
             });
             return new PageRes<>(new PageInfo<>(kwOrders));
         }