diff --git a/src/main/resources/mappers/basis/ToolsManageMapper.xml b/src/main/resources/mappers/basis/ToolsManageMapper.xml index d88e8fc..d513c73 100644 --- a/src/main/resources/mappers/basis/ToolsManageMapper.xml +++ b/src/main/resources/mappers/basis/ToolsManageMapper.xml @@ -30,6 +30,7 @@ WHERE is_hg=0 and tsd.dev_type_name is not null + and te.`status`=4 and tsd.dev_type_name like concat('%',#{sampleTools}, '%') diff --git a/src/main/resources/static/pages/user/changePassword.html b/src/main/resources/static/pages/user/changePassword.html index 10c789c..67f1049 100644 --- a/src/main/resources/static/pages/user/changePassword.html +++ b/src/main/resources/static/pages/user/changePassword.html @@ -171,11 +171,6 @@ passwordError.textContent = passwordTip; return false; } - - // formdata.oldPassword = encryptCBC(formdata.oldPassword); - // formdata.loginName = encryptCBC(formdata.loginName); - // formdata.username = encryptCBC(formdata.username); - // formdata.password = encryptCBC(formdata.newPassword); console.log(formdata) var params={ encryptedData:encryptCBC(JSON.stringify(formdata)) @@ -194,19 +189,6 @@ }, function (xhr) { error(xhr) }); - - // $.ajax({ - // type : 'put', - // url : ctxPath + '/users/password', - // contentType: "application/json; charset=utf-8", - // data: JSON.stringify(formdata), - // success : function(data) { - // layer.msg("修改成功", {shift: -1, time: 1000}, function(){ - // location.href = ctxPath + "/pages/user/userList.html"; - // }); - // } - // }); - }) }