From 2600e4f4f543e27e529113c53751be7305cd6aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 12 Jun 2020 11:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/manage/systemConfig.html | 138 +++++++++---------
erp_web/pages/manage/user.html | 4 +-
.../resources/mapper_xml/TenantMapperEx.xml | 4 +-
3 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html
index 7e8878a9..c3901b92 100644
--- a/erp_web/pages/manage/systemConfig.html
+++ b/erp_web/pages/manage/systemConfig.html
@@ -235,83 +235,85 @@
function deleteSystemConfig(systemConfigId) {
if(checkIsTestUser()) {
return;
- }
- $.messager.confirm('删除确认', '确定要删除此系统配置信息吗？', function (r) {
- if (r) {
- $.ajax({
- type: "post",
- url: "/systemConfig/batchDeleteSystemConfigByIds",
- dataType: "json",
- data: ({
- ids: systemConfigId
- }),
- success: function (res) {
- if(res && res.code == 200) {
- $("#searchBtn").click();
- } else {
- $.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
+ } else {
+ $.messager.confirm('删除确认', '确定要删除此系统配置信息吗？', function (r) {
+ if (r) {
+ $.ajax({
+ type: "post",
+ url: "/systemConfig/batchDeleteSystemConfigByIds",
+ dataType: "json",
+ data: ({
+ ids: systemConfigId
+ }),
+ success: function (res) {
+ if(res && res.code == 200) {
+ $("#searchBtn").click();
+ } else {
+ $.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
+ }
+ },
+ //此处添加错误处理
+ error: function () {
+ $.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
+ return;
}
- },
- //此处添加错误处理
- error: function () {
- $.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
- return;
- }
- });
- }
- });
+ });
+ }
+ });
+ }
}
//批量删除系统配置
function batDeleteSystemConfig() {
if(checkIsTestUser()) {
return;
- }
- var row = $('#tableData').datagrid('getChecked');
- if (row.length == 0) {
- $.messager.alert('删除提示', '没有记录被选中！', 'warning');
- return;
- }
- if (row.length > 0) {
- $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条系统配置信息吗？', function (r) {
- if (r) {
- var ids = "";
- for (var i = 0; i < row.length; i++) {
- if (i == row.length - 1) {
- ids += row[i].id;
- break;
- }
- ids += row[i].id + ",";
- }
- if(row[i].loginame == "jsh"){
- $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
- return;
- } else {
- $.ajax({
- type: "post",
- url: "/systemConfig/batchDeleteSystemConfigByIds",
- dataType: "json",
- async: false,
- data: ({
- ids: ids
- }),
- success: function (res) {
- if(res && res.code === 200) {
- $("#searchBtn").click();
- $(":checkbox").attr("checked", false);
- } else {
- $.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
- }
- },
- //此处添加错误处理
- error: function () {
- $.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
- return;
+ } else {
+ var row = $('#tableData').datagrid('getChecked');
+ if (row.length == 0) {
+ $.messager.alert('删除提示', '没有记录被选中！', 'warning');
+ return;
+ }
+ if (row.length > 0) {
+ $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条系统配置信息吗？', function (r) {
+ if (r) {
+ var ids = "";
+ for (var i = 0; i < row.length; i++) {
+ if (i == row.length - 1) {
+ ids += row[i].id;
+ break;
}
- });
+ ids += row[i].id + ",";
+ }
+ if(row[i].loginName == "jsh"){
+ $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
+ return;
+ } else {
+ $.ajax({
+ type: "post",
+ url: "/systemConfig/batchDeleteSystemConfigByIds",
+ dataType: "json",
+ async: false,
+ data: ({
+ ids: ids
+ }),
+ success: function (res) {
+ if(res && res.code === 200) {
+ $("#searchBtn").click();
+ $(":checkbox").attr("checked", false);
+ } else {
+ $.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
+ }
+ },
+ //此处添加错误处理
+ error: function () {
+ $.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
+ return;
+ }
+ });
+ }
}
- }
- });
+ });
+ }
}
}
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index a85da557..09f80460 100644
--- a/erp_web/pages/manage/user.html
+++ b/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");
diff --git a/src/main/resources/mapper_xml/TenantMapperEx.xml b/src/main/resources/mapper_xml/TenantMapperEx.xml
index 303b60d5..1a857e0e 100644
--- a/src/main/resources/mapper_xml/TenantMapperEx.xml
+++ b/src/main/resources/mapper_xml/TenantMapperEx.xml
@@ -6,7 +6,7 @@
FROM jsh_tenant
where 1=1
- and loginame like '%${loginName}%'
+ and login_name like '%${loginName}%'
limit #{offset},#{rows}
@@ -18,7 +18,7 @@
FROM jsh_tenant
WHERE 1=1
- and loginame like '%${loginName}%'
+ and login_name like '%${loginName}%'
\ No newline at end of file