Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -219,7 +219,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
           List<Integer> list =  userFeign.getUserIdByUsername(dto.getKeywords());
           if(list != null) {
               userIds.addAll(list);
-          } else {
+          }
+          if(userIds.size() <= 0) {
               return ObjectRestResponse.succ(new PageDataVO<>());
           }
         }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -383,9 +383,6 @@
             <if test="numberPlate != null">
                 and v1.number_plate = #{numberPlate}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (v1.number_plate like concat('%', #{keywords}, '%') or v1.code like concat('%', #{keywords}, '%'))
-            </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>
@@ -421,6 +418,9 @@
            <if test="code != null and code != ''">
                and v1.code = #{code}
            </if>
+           <if test="keywords != null and keywords != ''">
+               and (v1.number_plate like concat('%', #{keywords}, '%') or v1.code like concat('%', #{keywords}, '%'))
+           </if>
            <if test="companyIds != null and companyIds.size > 0">
                and v1.park_branch_company_id in
                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -485,6 +485,9 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
+            <if test="code !=null">
+                and v1.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v1.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -508,6 +511,9 @@
             <if test="status != null">
                 and v2.status = #{status}
             </if>
+            <if test="code !=null">
+                and v2.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v2.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">