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 getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,,]"); - Map> dictMap = new HashMap<>(16); + Map> 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 getDictByName(String name); + List 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 getDictByName(String name) { - return null; + public List getDictByName(String name) { + List dictDtos = this.findByDictName(name); + return dictDtos; + } + + private List 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