Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -144,6 +144,9 @@
             <if test="param.certificateType != null and param.certificateType != ''">and dbl.certificate_type =
                 #{param.certificateType}
             </if>
+            <if test="param.warehouseId != null and param.warehouseId != ''">and dbl.warehouse_id =
+                #{param.warehouseId}
+            </if>
 
         </where>
         GROUP BY dbl.id,dsa.warehouse,dsa.type_service

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1427,7 +1427,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<Long> collect = myWatchWarehouse.stream()
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		distrilbutionBillLadingDTO.setWarehouseIdList(collect);
+		if (Func.isNotEmpty(myWatchWarehouse)){
+			distrilbutionBillLadingDTO.setWarehouseIdList(null);
+			distrilbutionBillLadingDTO.setWarehouseId(myCurrentWarehouse.getId());
+		}
 		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO);
 		List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();
 		records.forEach(i -> {