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/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
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 95d3928..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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.mapper.AuthMapper;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.service.EnumService;
import com.yuanchu.mom.mapper.EnumMapper;
@@ -13,6 +14,7 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,6 +32,8 @@
private GetLook getLook;
private EnumMapper enumMapper;
+
+ private AuthMapper authMapper;
@Override
public Map<String, Object> selectEnumList(IPage<Enums> page, Enums enums) {
@@ -58,8 +62,14 @@
@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
+ public List<String> getDic() {
+ return authMapper.getDic();
+ }
+
}
--
Gitblit v1.9.3