From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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