From f954061dba3f793f817d396b53744ae3686ec5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 31 Mar 2020 21:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/jsh_erp.sql | 2 +- docs/数据库更新记录-方便升级.txt | 7 ++ erp_web/js/modules/sys/sysLogin.js | 35 +++--- erp_web/login.html | 2 +- erp_web/pages/manage/user.html | 111 +++++++++--------- erp_web/register.html | 12 +- .../java/com/jsh/erp/config/TenantConfig.java | 2 +- .../erp/controller/FunctionsController.java | 2 +- .../jsh/erp/controller/UserController.java | 24 ++-- .../com/jsh/erp/datasource/entities/User.java | 10 +- .../erp/datasource/entities/UserExample.java | 56 ++++----- .../erp/datasource/mappers/UserMapperEx.java | 2 +- .../MaterialExtend/MaterialExtendService.java | 8 +- .../com/jsh/erp/service/user/UserService.java | 30 ++--- src/main/resources/mapper_xml/UserMapper.xml | 28 ++--- .../resources/mapper_xml/UserMapperEx.xml | 14 +-- 16 files changed, 176 insertions(+), 169 deletions(-) diff --git a/docs/jsh_erp.sql b/docs/jsh_erp.sql index 593ceaf0..0ccd72f2 100644 --- a/docs/jsh_erp.sql +++ b/docs/jsh_erp.sql @@ -1085,7 +1085,7 @@ DROP TABLE IF EXISTS `jsh_user`; CREATE TABLE `jsh_user` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', `username` varchar(255) NOT NULL COMMENT '用户姓名--例如张三', - `loginame` varchar(255) DEFAULT NULL COMMENT '登录用户名--可能为空', + `login_name` varchar(255) NOT NULL COMMENT '登录用户名', `password` varchar(50) DEFAULT NULL COMMENT '登陆密码', `position` varchar(200) DEFAULT NULL COMMENT '职位', `department` varchar(255) DEFAULT NULL COMMENT '所属部门', diff --git a/docs/数据库更新记录-方便升级.txt b/docs/数据库更新记录-方便升级.txt index 21c2a0ec..1003a187 100644 --- a/docs/数据库更新记录-方便升级.txt +++ b/docs/数据库更新记录-方便升级.txt @@ -750,3 +750,10 @@ alter table jsh_depothead drop column AllocationProjectId; alter table jsh_unit add basic_unit varchar(50) DEFAULT NULL COMMENT '基础单位' after UName; alter table jsh_unit add other_unit varchar(50) DEFAULT NULL COMMENT '副单位' after basic_unit; alter table jsh_unit add ratio INT DEFAULT NULL COMMENT '比例' after other_unit; + +-- ---------------------------- +-- 时间：2020年03月31日 +-- by jishenghua +-- 给用户表增加 登录用户名 字段 +-- ---------------------------- +alter table jsh_user change loginame login_name varchar(255) NOT NULL COMMENT '登录用户名'; diff --git a/erp_web/js/modules/sys/sysLogin.js b/erp_web/js/modules/sys/sysLogin.js index 74fb044d..acf6fa1d 100644 --- a/erp_web/js/modules/sys/sysLogin.js +++ b/erp_web/js/modules/sys/sysLogin.js @@ -4,7 +4,7 @@ * @author jishenghua * @version 2019-09-14 */ -$("#username, #password").on("focus blur", function () { +$("#loginName, #password").on("focus blur", function () { var a = this; setTimeout(function () { var b = $(a).css("borderColor"); @@ -14,10 +14,10 @@ $("#username, #password").on("focus blur", function () { }, 100) }).blur(); -var userName = localStorage.getItem("username"); +var loginName = localStorage.getItem("loginName"); var password = localStorage.getItem("password"); -if(userName){ - $("#username").val(userName); +if(loginName){ + $("#loginName").val(loginName); setTimeout(function() { $("#rememberUserCode").parent().addClass("checked"); },200); @@ -36,8 +36,8 @@ $(document).keydown(function (event) { var k = e.keyCode || e.which || e.charCode; //兼容 IE,firefox 兼容 var obj = e.srcElement ? e.srcElement : e.target; - //绑定键盘事件为 username 和password的输入框才可以触发键盘事件 13键盘事件 - if (k == "13" && (obj.id == "username" || obj.id == "password")) + //绑定键盘事件为 loginName 和password的输入框才可以触发键盘事件 13键盘事件 + if (k == "13" && (obj.id == "loginName" || obj.id == "password")) loginFun(); }); @@ -45,39 +45,38 @@ $(document).keydown(function (event) { $('#btnSubmit').off("click").on("click", function () { var rememberUserCode = $("#rememberUserCode").parent().hasClass("checked"); var rememberMe = $("#rememberMe").parent().hasClass("checked"); - localStorage.removeItem("username"); + localStorage.removeItem("loginName"); localStorage.removeItem("password"); if(rememberUserCode) { - localStorage.setItem("username",$("#username").val()); + localStorage.setItem("loginName",$("#loginName").val()); } if(rememberMe) { - localStorage.setItem("username",$("#username").val()); + localStorage.setItem("loginName",$("#loginName").val()); localStorage.setItem("password",$("#password").val()); } loginFun(); }); //检测用户输入数据 function loginFun() { - var username = $.trim($('#username').val()); + var loginName = $.trim($('#loginName').val()); var password = $.trim($('#password').val()); - if (null == username || 0 == username.length) { - $("#username").val("").focus(); + if (null == loginName || 0 == loginName.length) { + $("#loginName").val("").focus(); return; } - if (null == password || 0 == password.length) { $("#password").val("").focus(); return; } - if (username != null && username.length != 0 + if (loginName != null && loginName.length != 0 && password != null && password.length != 0) { - $("#username").focus(); + $("#loginName").focus(); $.ajax({ type: "post", url: "/user/login", dataType: "json", data: ({ - loginName: username, + loginName: loginName, password: hex_md5(password) }), success: function (res) { @@ -85,7 +84,7 @@ function loginFun() { var loginInfoTip = res.data.msgTip; //用户名不存在，清空输入框并定位到用户名输入框 if (loginInfoTip.indexOf("user is not exist") != -1) { - $("#username").val("").focus(); + $("#loginName").val("").focus(); $("#password").val(""); alert("用户名不存在"); return; @@ -109,7 +108,7 @@ function loginFun() { if(res.data.user) { var user = res.data.user; sessionStorage.setItem("userId", user.id); - sessionStorage.setItem("loginName", user.loginame); + sessionStorage.setItem("loginName", user.loginName); top.location.href = "/index.html"; } } diff --git a/erp_web/login.html b/erp_web/login.html index 6164f26f..22d22e18 100644 --- a/erp_web/login.html +++ b/erp_web/login.html @@ -40,7 +40,7 @@
-
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html index 5a2b7a91..386e844b 100644 --- a/erp_web/pages/manage/user.html +++ b/erp_web/pages/manage/user.html @@ -24,7 +24,7 @@
- +
@@ -51,24 +51,11 @@ 登录名称 - 初始密码：123456 - - 部门 - - - - - - - - - - - 用户姓名 @@ -78,6 +65,19 @@ data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/> + + 部门 + + + + + + + + + + + 职位 @@ -186,7 +186,7 @@ return str; } }, - {title: '登录名称', field: 'loginame', width: 80}, + {title: '登录名称', field: 'loginName', width: 80}, {title: '用户姓名', field: 'username', width: 80, align: "center"}, {title: '职位', field: 'position', width: 115, align: "center"}, {title: '部门', field: 'orgAbr', width: 115, align: "center"}, @@ -237,7 +237,7 @@ } //搜索按钮添加快捷键 - if (k == "13" && (obj.id == "searchUsername" || obj.id == "searchLoginame" || obj.id == "searchPhonenum" + if (k == "13" && (obj.id == "searchUsername" || obj.id == "searchLoginName" || obj.id == "searchPhonenum" || obj.id == "searchPosition" || obj.id == "searchEmail" || obj.id == "searchDesc" || obj.id == "searchDept")) { $("#searchBtn").click(); } @@ -352,8 +352,6 @@ //增加用户 var url; var userID = 0; - //保存编辑前的名称 - var oldLoginName = ""; function addUser() { if(checkPower()){ @@ -366,7 +364,6 @@ $('#usernameFM').form('load', row); $("#username").focus(); $("#loginame").removeAttr("readonly"); - oldLoginName = ""; userID = 0; /**机构选择*/ $("#selectType").val("org"); @@ -401,40 +398,45 @@ //保存用户信息 $("#saveusername").off("click").on("click", function () { - /** - * 2019-03-12 - * 此处用户名和登录名是否重复的校验在保存操作时处理 - * */ - var reg = /^([0-9])+$/; - var phonenum = $.trim($("#phonenum").val()); - if (phonenum.length > 0 && !reg.test(phonenum)) { - $.messager.alert('提示', '电话号码只能是数字', 'info'); - $("#phonenum").val("").focus(); + if(!$('#usernameFM').form('validate')){ return; } - $.ajax({ - url: url, - type: "post", - dataType: "json", - data: { - info: JSON.stringify($("#usernameFM").serializeObject()) - }, - success: function(res) { - if(res && res.code != 200) { - $.messager.alert('提示', res.msg, 'error'); - return; - } - $('#userDlg').dialog('close'); - //加载完以后重新初始化 - var opts = $("#tableData").datagrid('options'); - showUserDetails(opts.pageNumber, opts.pageSize); - }, - //此处添加错误处理 - error: function () { - $.messager.alert('提示', '网络异常，请稍后再试！', 'error'); + else { + /** + * 2019-03-12 + * 此处用户名和登录名是否重复的校验在保存操作时处理 + * */ + var reg = /^([0-9])+$/; + var phonenum = $.trim($("#phonenum").val()); + if (phonenum.length > 0 && !reg.test(phonenum)) { + $.messager.alert('提示', '电话号码只能是数字', 'info'); + $("#phonenum").val("").focus(); return; } - }); + $.ajax({ + url: url, + type: "post", + dataType: "json", + data: { + info: JSON.stringify($("#usernameFM").serializeObject()) + }, + success: function (res) { + if (res && res.code != 200) { + $.messager.alert('提示', res.msg, 'error'); + return; + } + $('#userDlg').dialog('close'); + //加载完以后重新初始化 + var opts = $("#tableData").datagrid('options'); + showUserDetails(opts.pageNumber, opts.pageSize); + }, + //此处添加错误处理 + error: function () { + $.messager.alert('提示', '网络异常，请稍后再试！', 'error'); + return; + } + }); + } }); //编辑用户信息 @@ -442,7 +444,7 @@ var rowsdata = $("#tableData").datagrid("getRows")[index]; var row = { username: rowsdata.username, - loginame: rowsdata.loginame, + loginName: rowsdata.loginName, position: rowsdata.position, email: rowsdata.email, phonenum: rowsdata.phonenum, @@ -452,14 +454,13 @@ orgaUserRelId: rowsdata.orgaUserRelId, userBlngOrgaDsplSeq: rowsdata.userBlngOrgaDsplSeq }; - oldLoginName = rowsdata.username; $('#userDlg').dialog('open').dialog('setTitle', ' 编辑用户信息'); $(".window-mask").css({width: webW, height: webH}); $('#usernameFM').form('load', row); userID = rowsdata.id; //焦点在名称输入框==定焦在输入文字后面 $("#username").val("").focus().val(rowsdata.username); - $("#loginame").attr("readonly","readonly"); + $("#loginName").attr("readonly","readonly"); /**机构选择*/ $("#selectType").val("org"); url = '/user/updateUser?id=' + rowsdata.id; @@ -484,7 +485,7 @@ function showUserDetails(pageNo, pageSize) { var userName = $.trim($("#searchUsername").val()); - var loginName = $.trim($("#searchLoginame").val()); + var loginName = $.trim($("#searchLoginName").val()); $.ajax({ type: "get", url: "/user/getUserList", @@ -516,7 +517,7 @@ $("#searchResetBtn").unbind().bind({ click: function () { $("#searchUsername").textbox("setValue",""); - $("#searchLoginame").textbox("setValue",""); + $("#searchLoginName").textbox("setValue",""); $("#searchPhonenum").textbox("setValue",""); $("#searchPosition").textbox("setValue",""); $("#searchDept").textbox("setValue",""); diff --git a/erp_web/register.html b/erp_web/register.html index 6f4ebe18..d7eb15c4 100644 --- a/erp_web/register.html +++ b/erp_web/register.html @@ -43,7 +43,7 @@
-
@@ -106,7 +106,7 @@