bug201 【(app/h5)首页/我的订单各个tab】

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java

@@ -1660,7 +1660,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "))",
             "</when>",
             "<when test = 'query.searchKey != null and query.searchKey != \"\" '>",
-            "AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))",
+            "AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))",
             "</when>",
             "<when test = 'query.marks != null and query.marks != \"\" '>",
             "AND o.`marks` like concat('%',concat(#{query.marks},'%'))",
@@ -2409,7 +2409,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "<foreach item='customerContactsId' index='index' collection='query.consigneeContactsIds' open='(' separator=',' close=')'>#{customerContactsId}</foreach>",
             "</if>)",
             "<when test = 'query.searchKey != null and query.searchKey != \"\" '>",
-            "AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))",
+            "AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))",
             "</when>",
             "<when test = 'query.orderNo != null and query.orderNo != \"\" '>",
             "AND o.`order_no` like concat('%',concat(#{query.orderNo},'%'))",

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -4233,7 +4233,7 @@
         </if>
         <if test="query.searchKey != null and query.searchKey != '' ">
             AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
-            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like
+            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
             concat("%",concat(#{query.searchKey},"%"))
         </if>
         <if test="query.consignorKey != null and query.consignorKey != '' ">
@@ -5825,7 +5825,7 @@
         </if>
         <if test="query.searchKey != null and query.searchKey != '' ">
             AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
-            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like
+            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
             concat("%",concat(#{query.searchKey},"%"))
         </if>
         <if test="query.consignorKey != null and query.consignorKey != '' ">
@@ -6452,7 +6452,7 @@
         </if>
         <if test="query.searchKey != null and query.searchKey != '' ">
             AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
-            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like
+            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
             concat("%",concat(#{query.searchKey},"%"))
         </if>
         <if test="query.type != null and query.type != '' and query.type == 0 ">
@@ -6931,7 +6931,7 @@
         </if>
         <if test="query.searchKey != null and query.searchKey != '' ">
             AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
-            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like
+            ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
             concat("%",concat(#{query.searchKey},"%"))
         </if>
         <if test="query.type != null and query.type != '' and query.type == 0 ">