null 处理

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -143,7 +143,7 @@ public class WaybillManagementService {
             wayBillDetailDTO.setCheckFirmName(info.getCheckFirmName());
             // 运输量单位
             wayBillDetailDTO.setUnit(info.getUnit() == null ? null : info.getUnit());
-            if(info.getUnit() != null) {
+            if (info.getUnit() != null) {
                 Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
                 SysDictResDto sysDict = unitType.get(info.getUnit());
                 wayBillDetailDTO.setUnitLabel(sysDict.getLabel());
@@ -449,9 +449,9 @@ public class WaybillManagementService {
             waybillBoardListVO.setTracks(statusVOS2);
             // 运单量单位
             waybillBoardListVO.setUnit(sckwWaybillOrder.getUnit());
-            if(sckwWaybillOrder.getUnit() != null) {
+            if (sckwWaybillOrder.getUnit() != null) {
                 Map<String, String> unitType = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-                String sysDict = unitType.get(sckwWaybillOrder.getUnit());
+                String sysDict = unitType == null ? null : unitType.get(sckwWaybillOrder.getUnit());
                 waybillBoardListVO.setUnitLabel(sysDict);
             }
             // 运单进度