From 0b78bcecf7e72836e9b1cf4d96e07fe6c7d1fd3c Mon Sep 17 00:00:00 2001 From: Guo XIn <371864209@qq.com> Date: Mon, 3 Jul 2023 17:38:51 +0800 Subject: [PATCH] =?UTF-8?q?update.sql=E6=9B=B4=E6=96=B0=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=B5=84=E6=BA=90=E6=B3=A8=E5=86=8C=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=AF=86=E7=BA=A7=E5=88=A4=E6=96=AD?= =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=AF=86=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=20=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=BF=AE=E6=94=B9=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbsql/update/update202306.sql | 8 +++++--- .../main/resources/static/js/business/metadata/edit.js | 5 +++++ .../resources/view/business/metadata/metadataEdit.html | 2 +- shandan-common/src/main/resources/view/common/head.html | 5 ++--- .../resources/static/js/business/directory/dirCommon.js | 2 +- .../src/main/resources/static/js/sys/org/org.js | 2 +- .../src/main/resources/static/js/sys/user/edit.js | 8 ++++++++ 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dbsql/update/update202306.sql b/dbsql/update/update202306.sql index d250016..81f8622 100644 --- a/dbsql/update/update202306.sql +++ b/dbsql/update/update202306.sql @@ -4,6 +4,8 @@ comment on column BIANMU.SYS_USER.SECRET_LEVEL is '涉密级别'; -- 目录表增加数据密级字段 alter table BIANMU.B_DIRECTORY add SECRET_LEVEL integer default 0 not null; comment on column BIANMU.B_DIRECTORY.SECRET_LEVEL is '数据密级'; - -UPDATE BIANMU.SYS_USER t SET t.SECRET_LEVEL = 4 WHERE t.USER_ID = 'admin' -UPDATE BIANMU.SYS_USER t SET t.SECRET_LEVEL = 4 WHERE t.USER_ID = 'sa' \ No newline at end of file +-- 修改管理员用户的涉密级别为最高级别 +UPDATE BIANMU.SYS_USER t SET t.SECRET_LEVEL = 4 WHERE t.USER_ID = 'admin'; +UPDATE BIANMU.SYS_USER t SET t.SECRET_LEVEL = 4 WHERE t.USER_ID = 'sa'; +-- 启用密级字段项中的内部 +UPDATE BIANMU.SYS_DICT t SET t.DICT_STATE = 1 WHERE t.ID = '2'; \ No newline at end of file diff --git a/shandan-bianmu/src/main/resources/static/js/business/metadata/edit.js b/shandan-bianmu/src/main/resources/static/js/business/metadata/edit.js index 12df89b..64c0398 100644 --- a/shandan-bianmu/src/main/resources/static/js/business/metadata/edit.js +++ b/shandan-bianmu/src/main/resources/static/js/business/metadata/edit.js @@ -27,6 +27,11 @@ layui.use(['form', 'layer', 'editPage', 'laytpl', 'laydate', 'element', 'table', formInitUrl: requestParam.id ? `${ctx}/business/metadata/get/${requestParam.id}` : '', formSubmitInvoke: async function () { // 自定义表单提交时的方法 let metadataBasic = form.val('metadataForm'); + console.info(user); + if(metadataBasic.secretLevel > user.secretLevel){ + layer.alert('禁止上传超过自身涉密等级的数据，您的涉密等级为【'+ DICT.getText('secret_level', user.secretLevel) +'】', {icon:2}) + return; + } metadataBasic.metadataDetailsList = []; for (let metadata of metadataTableMap.values()) { metadataBasic.metadataDetailsList.push(metadata); diff --git a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html index 144306b..292349c 100644 --- a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html +++ b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html @@ -66,7 +66,7 @@
-
diff --git a/shandan-common/src/main/resources/view/common/head.html b/shandan-common/src/main/resources/view/common/head.html index 2176679..45f4b1b 100644 --- a/shandan-common/src/main/resources/view/common/head.html +++ b/shandan-common/src/main/resources/view/common/head.html @@ -11,9 +11,8 @@ //项目根路径 // ctx = /*[[@{/}]]*/''; ctx = [[${#request.getContextPath()}]];//应用路径 - user = sessionStorage.getItem('login_user'); - let newUser = /*[[${loginUser}]]*/ {}; - sessionStorage.setItem('login_user', JSON.stringify(newUser)); + user = /*[[${loginUser}]]*/ {}; + sessionStorage.setItem('login_user', JSON.stringify(user)); //获取api加密开关并存到sessionStorage let sys = sessionStorage.getItem('sysApiEncrypt'); diff --git a/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js b/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js index 21fbb6c..4cea208 100644 --- a/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js +++ b/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js @@ -175,7 +175,7 @@ function openDirectoryEditLayer(data, callback, view) { function saveDirectory(index, callback) { form.on('submit(directoryEditForm)', function ({elem, field}) { if(field.secretLevel > user.secretLevel){ - layer.alert('禁止上传超过自身涉密等级的文件，您的涉密等级为【'+ DICT.getText('secret_level', user.secretLevel) +'】') + layer.alert('禁止上传超过自身涉密等级的文件，您的涉密等级为【'+ DICT.getText('secret_level', user.secretLevel) +'】', {icon:2}) return; } // 转换数据类型 diff --git a/shandan-system/src/main/resources/static/js/sys/org/org.js b/shandan-system/src/main/resources/static/js/sys/org/org.js index 7dda7f1..69484da 100644 --- a/shandan-system/src/main/resources/static/js/sys/org/org.js +++ b/shandan-system/src/main/resources/static/js/sys/org/org.js @@ -134,7 +134,7 @@ layui.use(['layer', 'gtable', 'orgTree'], function () { let queryOps = {where: {orgParentId: param.id}, page: {page: 1}}; gtable.reload(queryOps); - let currentUserOrg = JSON.parse(user).org; + let currentUserOrg = user.org; let data = param.recordData; if(data && data.orgPath.startsWith(currentUserOrg.orgPath)){ isParent = true; diff --git a/shandan-system/src/main/resources/static/js/sys/user/edit.js b/shandan-system/src/main/resources/static/js/sys/user/edit.js index 5bec634..8a9a888 100644 --- a/shandan-system/src/main/resources/static/js/sys/user/edit.js +++ b/shandan-system/src/main/resources/static/js/sys/user/edit.js @@ -19,6 +19,14 @@ layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'dict', 'dtre */ function save() { let userForm = $("#userForm").serializeObject(); + if(userForm.userId === user.userId){ + layer.alert('该操作包含数据权限等危险操作，所以您不能直接修改自己的用户数据，请联系您的上级主管', {icon:2}) + return false; + } + if(userForm.secretLevel > user.secretLevel){ + layer.alert('无法为用户设置超过自身涉密等级的权限，您的涉密等级为【'+ DICT.getText('secret_level', user.secretLevel) +'】', {icon:2}) + return; + } form.on('submit(userForm)', function(){ $.post(ctx + "/sys/sysUser/save", userForm, function (data) { if (!data.flag) {