Merge remote-tracking branch 'origin/dev' into dev

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -608,10 +608,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         list.forEach(map -> {
             map.put("fBilltype", "其他账务");
             if (map.get("fVslid") != null) {
-                map.put("shipsName", tVesselMapper.selectTVesselById(((Integer) map.get("fVslid")).longValue()).getfName());
+                TVessel fVslid = tVesselMapper.selectTVesselById(((Integer) map.get("fVslid")).longValue());
+                if (fVslid != null){
+                    map.put("shipsName", fVslid.getfName());
+                }
             }
             if (map.get("fVoyid") != null) {
-                map.put("voyage", tVoyageMapper.selectTVoyageById(((Integer) map.get("fVoyid")).longValue()).getfNo());
+                TVoyage voyage = tVoyageMapper.selectTVoyageById(((Integer) map.get("fVoyid")).longValue());
+                if (voyage != null){
+                    map.put("voyage", voyage.getfNo());
+                }
             }
         });
         return list;