| 
					
				 | 
			
			
				@@ -489,8 +489,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Map<String, Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         list.forEach(map -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             map.put("fBilltype", "其他账务"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            map.put("shipsName", tVesselMapper.selectTVesselById(((Integer) map.get("fVslid")).longValue()).getfName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            map.put("voyage", tVoyageMapper.selectTVoyageById(((Integer) map.get("fVoyid")).longValue()).getfNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (map.get("fVslid") != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("shipsName", tVesselMapper.selectTVesselById(((Integer) map.get("fVslid")).longValue()).getfName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (map.get("fVoyid") != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("voyage", tVoyageMapper.selectTVoyageById(((Integer) map.get("fVoyid")).longValue()).getfNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |