From ccc607d9eb6925fbf073c3626b2daf81933347fd Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 26 四月 2024 22:00:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/resources/mapper/EnumMapper.xml | 10 +++++++++-
user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java | 2 ++
user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java
index 1997d72..0bdfdf0 100644
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java
@@ -17,6 +17,8 @@
IPage<Enums> selectEnumPageList(IPage<Enums> page, QueryWrapper<Enums> ew);
+ List<Enums> selectEnumByCategory(String category);
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
index 3a4d304..4a2fddc 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
@@ -62,7 +62,7 @@
@Override
public List<Enums> selectEnumByCategory(String category) {
- return enumMapper.selectList(Wrappers.<Enums>lambdaQuery().eq(Enums::getCategory, category).select(Enums::getLabel,Enums::getValue).orderByAsc(Enums::getOrderNum).orderByAsc(Enums::getId));
+ return enumMapper.selectEnumByCategory(category);
}
@Override
diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
index 2fdfd9e..9920a55 100644
--- a/user-server/src/main/resources/mapper/EnumMapper.xml
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -22,7 +22,7 @@
<select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
select * from (
- 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
+ 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
@@ -31,4 +31,12 @@
${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