From cc257fdfa5d9e42565e50e0cb28ae3a85b163267 Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sat, 12 Oct 2024 11:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8A=A0=E5=88=86=E9=A1=B5-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/master/MaterialMainMapper.xml   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
index 9b3645a0..1ca74d19 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
@@ -228,6 +228,16 @@
         <if test="query.materialDesc != null and query.materialDesc != ''">
             and material_desc like concat('%',#{query.materialDesc},'%')
         </if>
-        order by orderMfiled
+        <choose>
+            <when test="query.materialNo != null and query.materialNo != ''" >
+                 order by  orderMaterialNo
+            </when>
+            <when test="query.drawingNo != null and query.drawingNo != ''">
+                order by orderDrawingNo
+            </when>
+            <when test="query.materialDesc != null and query.materialDesc != ''">
+                order by orderMaterialDesc
+            </when>
+        </choose>
     </select>
 </mapper>