From 22a612dd5f4e1388b9e55f98ab438646842d5e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 22 May 2023 22:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86=E9=80=89=E6=8B=A9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index ec5c3728..9284c606 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -547,7 +547,7 @@
         </foreach>
         )
         and ifnull(m.delete_flag,'0') !='1'
-        order by me.id desc
+        order by m.id desc, me.default_flag desc, me.id asc
     </select>
 
     <select id="getMaterialByBarCodeAndWithOutMId" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">