From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 05c999f..61c9d56 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -235,4 +236,16 @@
}
return UserConstants.UNIQUE;
}
+
+ @Override
+ public Map<String, List<SysDictData>> selectEnumListByCategory(List<String> categoryList) {
+ Map<String,List<SysDictData>> resultList = new HashMap<>();
+ if(!categoryList.isEmpty()){
+ for (String category : categoryList) {
+ List<SysDictData> enums = selectDictDataByName(category);
+ resultList.put(category,enums);
+ }
+ }
+ return resultList;
+ }
}
--
Gitblit v1.9.3