From d5a3d84b74deec5aa3a3a4c11c62135f70536692 Mon Sep 17 00:00:00 2001
From: liyd <1419499670@qq.com>
Date: Wed, 30 Nov 2022 19:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/rest/DictDetailController.java   |  2 +-
 .../modules/system/service/DictDetailService.java   |  2 +-
 .../system/service/impl/DictDetailServiceImpl.java  | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java
index cd36122..bad6e1e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java
@@ -64,7 +64,7 @@ public class DictDetailController {
     @GetMapping(value = "/map")
     public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName){
         String[] names = dictName.split("[,，]");
-        Map<String, List<DictDetailDto>> dictMap = new HashMap<>(16);
+        Map<String, List<DictDto>> dictMap = new HashMap<>(16);
         for (String name : names) {
             dictMap.put(name, dictDetailService.getDictByName(name));
         }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java
index 3c7bd85..340a178 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java
@@ -61,7 +61,7 @@ public interface DictDetailService {
      * @param name 字典名称
      * @return /
      */
-    List<DictDetailDto> getDictByName(String name);
+    List<DictDto> getDictByName(String name);
 
     /**
      * 根据ID查询
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java
index 96932d4..c5051aa 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java
@@ -19,6 +19,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.exception.BadRequestException;
@@ -103,8 +104,16 @@ public class DictDetailServiceImpl implements DictDetailService {
 
     @Override
     @Cacheable(key = "'name:' + #p0")
-    public List<DictDetailDto> getDictByName(String name) {
-        return null;
+    public List<DictDto> getDictByName(String name) {
+        List<DictDto> dictDtos = this.findByDictName(name);
+        return dictDtos;
+    }
+
+    private List<DictDto> findByDictName(String name) { // 前端的name就是code
+        WQLObject wo = WQLObject.getWQLObject("sys_dict");
+        JSONArray jsonArray = wo.query("code = '" + name + "' AND " +
+                "label IS NOT NULL AND label != '' ").getResultJSONArray(0);
+        return jsonArray.toJavaList(DictDto.class);
     }
 
     @Override