fix: 解决旅行社端查看订单列表报错和没有做分销商数据隔离的问题

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -225,7 +225,9 @@ public class OtcTradeOrderController {
         List<TradeOrderCountryDO> countryList = tradeOrderCountryService.getListByOrderIds(orderIds);
         List<TradeOrderCountryBaseVO> countRespVOList = BeanUtils.toBean(countryList, TradeOrderCountryBaseVO.class);
         countRespVOList.stream().forEach(item -> {
-            item.setCountryName(AreaUtils.format2Str(item.getCountryId()));
+            if(item.getCountryId() != null) {
+                item.setCountryName(AreaUtils.format2Str(item.getCountryId()));
+            }
         });
         Map<Long, List<TradeOrderCountryBaseVO>> countryMap = CollectionUtils.convertMultiMap(countRespVOList, TradeOrderCountryBaseVO::getOrderId);
 

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -329,6 +329,9 @@
         <if test="vo.sourceId != null and vo.sourceId != ''">
             AND td.source_id = #{vo.sourceId}
         </if>
+        <if test="vo.distributorId != null and vo.distributorId != ''">
+            AND td.source_id = #{vo.distributorId}
+        </if>
         <if test="vo.sourceName != null and vo.sourceName != ''">
             AND td.source_name like concat('%',#{vo.sourceName}, '%')
         </if>