优化系统配置

erp_web/pages/manage/systemConfig.html

@@ -235,7 +235,7 @@
     function deleteSystemConfig(systemConfigId) {
         if(checkIsTestUser()) {
             return;
-        }
+        } else {
             $.messager.confirm('删除确认', '确定要删除此系统配置信息吗？', function (r) {
                 if (r) {
                     $.ajax({
@@ -261,12 +261,13 @@
                 }
             });
         }
+    }
 
     //批量删除系统配置
     function batDeleteSystemConfig() {
         if(checkIsTestUser()) {
             return;
-        }
+        } else {
             var row = $('#tableData').datagrid('getChecked');
             if (row.length == 0) {
                 $.messager.alert('删除提示', '没有记录被选中！', 'warning');
@@ -283,7 +284,7 @@
                             }
                             ids += row[i].id + ",";
                         }
-                    if(row[i].loginame == "jsh"){
+                        if(row[i].loginName == "jsh"){
                             $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
                             return;
                         } else {
@@ -314,6 +315,7 @@
                 });
             }
         }
+    }
 
     //增加系统配置
     var url;

erp_web/pages/manage/user.html

@@ -313,7 +313,7 @@
                         }
                         ids += row[i].id + ",";
                     }
-                    if(row[i].loginame == "jsh"){
+                    if(row[i].loginName == "jsh"){
                         $.messager.alert('提示', '租户jsh不能删除！', 'warning');
                         return;
                     } else if(row[i].id == row[i].tenantId) {
@@ -363,7 +363,7 @@
         var row = {};
         $('#usernameFM').form('load', row);
         $("#username").focus();
-        $("#loginame").removeAttr("readonly");
+        $("#loginName").removeAttr("readonly");
         userID = 0;
         /**机构选择*/
         $("#selectType").val("org");

src/main/resources/mapper_xml/TenantMapperEx.xml

@@ -6,7 +6,7 @@
         FROM jsh_tenant
         where 1=1
         <if test="loginName != null">
-            and loginame like '%${loginName}%'
+            and login_name like '%${loginName}%'
         </if>
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -18,7 +18,7 @@
         FROM jsh_tenant
         WHERE 1=1
         <if test="loginName != null">
-            and loginame like '%${loginName}%'
+            and login_name like '%${loginName}%'
         </if>
     </select>
 </mapper>