From 4086570d2a4091c86e6fad35a0c36c8963cdf415 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 24 十一月 2025 14:56:26 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
index b09e873..f685d82 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
@@ -9,6 +9,7 @@
         from
             basic_data as a
         where a.basic_type=#{type}
+        order by sort
     </select>
     <select id="getOrderBasicDataByTypeAndChildType">
         select
@@ -45,7 +46,7 @@
 
     <select id="getBasicDataMaxSort">
         select
-            max(sort)
+            ifnull(max(sort),0)
         from
             basic_data as a
         where a.basic_category=#{type}

--
Gitblit v1.8.0