From 8577a11e5093871b2b5d6988431e7e22e76d43e6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 01:46:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/resources/mapper/EnumMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
index 3f10307..9920a55 100644
--- a/user-server/src/main/resources/mapper/EnumMapper.xml
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -22,14 +22,21 @@
 
     <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
         select * from (
-        select e.id,e.category,e.label,e.value,e.order_num, u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
+        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
         from enums e
         left join user u2 on u2.id = e.create_user
         left join user u3 on u3.id = e.update_user
-        order by category,order_num,id
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
     </select>
+   
+    <select id="selectEnumByCategory" resultType="com.yuanchu.mom.pojo.Enums">
+        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
+        from enums e
+        left join user u2 on u2.id = e.create_user
+        left join user u3 on u3.id = e.update_user
+        where e.category=#{category}
+    </select>
 </mapper>

--
Gitblit v1.9.3