Kaynağa Gözat

Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

lishiqiang 2 gün önce
ebeveyn
işleme
99bd88c962

+ 2 - 2
ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -10,7 +10,7 @@
 
     <select id="selectPage2"
             resultType="com.yc.ship.module.trade.dal.dataobject.orderjzdetail.OrderJzDetailDO">
-        select d.* , r.direction , rm.name as room_model_name
+        select distinct d.* , r.direction , rm.name as room_model_name
         from trade_order_jz_detail d
         inner join trade_order_jz oz on d.jz_id = oz.id
         inner join trade_order o on o.deleted = 0 and o.id = oz.order_id
@@ -34,7 +34,7 @@
         order by d.address asc, d.arrive_time asc, d.batch_no asc
     </select>
     <select id="selectPage3" resultType="map">
-        select o.id, o.order_no, r.direction , v.name, v.credential_no, v.mobile
+        select distinct o.id, o.order_no, r.direction , v.name, v.credential_no, v.mobile
         from trade_order o
         inner join product_voyage p on o.voyage_id = p.id
         inner join resource_route r on p.route_id = r.id