1、优化

Former-commit-id: b01f0351816e0ee0e002b730a8304b9554240a76

src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_MySQL.xml

@@ -32,6 +32,9 @@
         <include refid="table"/>
         WHERE
         `IS_DELETED` = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND `DICT_NAME` = ${r"#"}{request.dictName}
+        </if>
         <if test="request.key != null and request.key != ''">
             AND `KEY` = ${r"#"}{request.key}
         </if>

src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_Oracle.xml

@@ -32,6 +32,9 @@
         <include refid="table"/>
         WHERE
         "IS_DELETED" = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND "DICT_NAME" = ${r"#"}{request.dictName}
+        </if>
         <if test="request.key != null and request.key != ''">
             AND "KEY" = ${r"#"}{request.key}
         </if>

src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper_SQLite.xml

@@ -32,6 +32,9 @@
         <include refid="table"/>
         WHERE
         "IS_DELETED" = 0
+        <if test="request.dictName != null and request.dictName != ''">
+            AND DICT_NAME = ${r"#"}{request.dictName}
+        </if>
         <if test="request.key != null and request.key != ''">
             AND KEY = ${r"#"}{request.key}
         </if>

src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java

@@ -15,6 +15,7 @@ public class DictItemFindRequest extends BaseFindRequest {
      * 字典项ID
      */
     private Long id;
+
     /**
      * 字典明名称
      */

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))

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl

@@ -66,7 +66,7 @@
                     </el-tooltip>
 
                     <el-tooltip effect="dark" content="Excel导入" placement="bottom">
-                        <el-button size="small" class="el-icon-upload2" @click="onImport"></el-button>
+                        <el-button size="small" icon="el-icon-upload2" @click="onImport"></el-button>
                     </el-tooltip>
 
                     <el-tooltip effect="dark" content="批量删除" placement="bottom">

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl

@@ -64,7 +64,7 @@
                     </el-tooltip>
 
                     <el-tooltip effect="dark" content="Excel导入" placement="bottom">
-                        <el-button size="small" class="el-icon-upload2" @click="onImport"></el-button>
+                        <el-button size="small" icon="el-icon-upload2" @click="onImport"></el-button>
                     </el-tooltip>
 
                     <el-tooltip effect="dark" content="批量删除" placement="bottom">