From 22c5d4469abe7362292088d40c468f2bcf83fc82 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 5 Aug 2024 14:06:52 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=9B=86=E5=90=88=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8D=87=E5=BA=8F=20=E4=BF=AE=E6=94=B9=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E9=A2=86=E6=96=99=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=9B=86=E5=90=88=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8D=87=E5=BA=8F=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=9B=86?=
 =?UTF-8?q?=E5=90=88=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8D=87=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml   | 2 +-
 .../resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml | 2 +-
 .../src/main/resources/mapper/purchase/PurchaseOrderMapper.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
index 3ab27efe..893f9665 100644
--- a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
         </where>
-        order by create_time desc
+        order by  audit_status asc ,create_time desc
     </select>
     
     <select id="selectErpDevelopModifyorderById" parameterType="Long" resultMap="ErpDevelopModifyorderResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml
index 6309e0ae..6f888d22 100644
--- a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pickUser != null  and pickUser != ''"> and pick_user = #{pickUser}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
-        order by create_time desc
+        order by  audit_status asc ,create_time desc
     </select>
     
     <select id="selectErpDevelopModifyorderPickingById" parameterType="Long" resultMap="ErpDevelopModifyorderPickingResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml
index b623c2f1..c4414271 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and  pur.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
         </where>
-        order by pur.create_time desc
+        order by pur.audit_status asc, pur.create_time desc
     </select>
     
     <select id="selectPurchaseOrderById" parameterType="Long" resultMap="PurchaseOrderResult">