From f4199191b6f02ad719bfbea18f1acf732f9dd1ba Mon Sep 17 00:00:00 2001 From: liyd <1419499670@qq.com> Date: Wed, 7 Dec 2022 11:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dto/DictDetailQueryCriteria.java | 2 +- .../service/impl/DictDetailServiceImpl.java | 1 + .../java/org/nl/sso/system/wql/SYS_DICT.wql | 4 +++ .../src/views/system/menu/index.vue | 34 +++++++++++++++---- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/dto/DictDetailQueryCriteria.java b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/dto/DictDetailQueryCriteria.java index 54f6dbe54..fd8ea7072 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/dto/DictDetailQueryCriteria.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/dto/DictDetailQueryCriteria.java @@ -27,6 +27,6 @@ public class DictDetailQueryCriteria { private String code; - private String name; + private String dictName; private String dict_id; } diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/DictDetailServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/DictDetailServiceImpl.java index eb9aeaa60..7fa6b8ca7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/DictDetailServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/DictDetailServiceImpl.java @@ -53,6 +53,7 @@ public class DictDetailServiceImpl implements DictDetailService { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("code", criteria.getCode()); + map.put("dictName", criteria.getDictName()); JSONObject json = WQL.getWO("SYS_DICT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(pageable), "dict_sort asc"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DICT.wql b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DICT.wql index b58fb0120..0f4abca19 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DICT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/wql/SYS_DICT.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.blurry TYPEAS s_string 输入.code TYPEAS s_string + 输入.dictName TYPEAS s_string [临时表] @@ -70,6 +71,9 @@ OPTION 输入.code <> "" dict.code = 输入.code ENDOPTION + OPTION 输入.dictName <> "" + dict.code = 输入.dictName + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue index d7abcc546..230b4f86a 100644 --- a/lms/nladmin-ui/src/views/system/menu/index.vue +++ b/lms/nladmin-ui/src/views/system/menu/index.vue @@ -137,8 +137,12 @@ @selection-change="crud.selectionChangeHandler" > - - + + + +