From 6d6ae282ee8a58d6846e7c6986649c474444dae7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 十二月 2025 10:37:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml |   12 +++++++++++-
 1 files changed, 11 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 18bc20d..f685d82 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
@@ -2,13 +2,14 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.erp.mapper.sd.BasicDateMapper">
+<mapper namespace="com.example.erp.mapper.sd.BasicDataMapper">
     <select id="getOrderBasicData">
         select
             id,basic_type,if(basic_category='icon',null,nickname) as 'nickname',basic_name,basic_category,create_time,update_time
         from
             basic_data as a
         where a.basic_type=#{type}
+        order by sort
     </select>
     <select id="getOrderBasicDataByTypeAndChildType">
         select
@@ -16,6 +17,7 @@
         from
             basic_data as a
         where a.basic_type=#{type} and a.basic_category = #{childType}
+        order by sort
     </select>
 
     <select id="getOrderBasicDataType">
@@ -41,4 +43,12 @@
         select * from basic_data
         group by basic_category
     </select>
+
+    <select id="getBasicDataMaxSort">
+        select
+            ifnull(max(sort),0)
+        from
+            basic_data as a
+        where a.basic_category=#{type}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0