Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -639,6 +639,18 @@
       order by "insertTime" desc
     </if>
   </sql>
+  <!--根据销售订单号排序-->
+  <sql id="orderBy1">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "saleNumber" desc
+    </if>
+  </sql>
   <select id="getSaleOrderInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -1852,7 +1864,7 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+    <include refid="orderBy1"></include>
   </select>
 
   <select id="getAmsSaleOrderApprovedes" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">