diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_MySQL.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_MySQL.xml index 1fec7553..a4ee4edd 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_MySQL.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_MySQL.xml @@ -32,6 +32,9 @@ WHERE `IS_DELETED` = 0 + + AND `DICT_NAME` = ${r"#"}{request.dictName} + AND `KEY` = ${r"#"}{request.key} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_Oracle.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_Oracle.xml index 73f2b1b4..f805346d 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_Oracle.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_Oracle.xml @@ -32,6 +32,9 @@ WHERE "IS_DELETED" = 0 + + AND "DICT_NAME" = ${r"#"}{request.dictName} + AND "KEY" = ${r"#"}{request.key} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_SQLite.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_SQLite.xml index 35f6f808..a519e0f6 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_SQLite.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_SQLite.xml @@ -32,6 +32,9 @@ WHERE "IS_DELETED" = 0 + + AND DICT_NAME = ${r"#"}{request.dictName} + AND KEY = ${r"#"}{request.key} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java index cbb72f73..35773cb7 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java @@ -15,6 +15,7 @@ public class DictItemFindRequest extends BaseFindRequest { * 字典项ID */ private Long id; + /** * 字典明名称 */ diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl index 08426340..588c6e16 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl @@ -413,6 +413,7 @@ nav.e(response.errors[0].message); } else { this.onFind(); + this.$refs['form'].resetFields(); this.form.dialog = false; } }.bind(this)) @@ -422,6 +423,7 @@ nav.e(response.errors[0].message); } else { this.onFind(); + this.$refs['form'].resetFields(); this.form.dialog = false; } }.bind(this)) diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl index 28047fa9..e0d04929 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl @@ -66,7 +66,7 @@ - + diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl index 8e2f5b73..65bdebcd 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl @@ -64,7 +64,7 @@ - +