diff --git a/dbsql/update/update202306.sql b/dbsql/update/update202306.sql new file mode 100644 index 0000000..888be7d --- /dev/null +++ b/dbsql/update/update202306.sql @@ -0,0 +1,3 @@ +-- 用户表增加涉密级别字段 +alter table BIANMU.SYS_USER add SECRET_LEVEL integer default 0 not null; +comment on column BIANMU.SYS_USER.SECRET_LEVEL is '涉密级别'; \ No newline at end of file diff --git a/shandan-common/src/main/resources/static/js/common/layui/extend/dict.js b/shandan-common/src/main/resources/static/js/common/layui/extend/dict.js index 9e7d7bd..bc73c95 100644 --- a/shandan-common/src/main/resources/static/js/common/layui/extend/dict.js +++ b/shandan-common/src/main/resources/static/js/common/layui/extend/dict.js @@ -127,10 +127,10 @@ layui.define(['form'], function (exports) { return; } if (typeof data == 'object') { - data = data[this.name] || ''; + data = data[this.name] || (data[this.name] === 0 ? 0 : ''); } - if (this.type == 'checkbox') { + if (this.type === 'checkbox') { let values = data; let elements = $(`[lay-filter="${this.formFilter}"] input[type="checkbox"][name="${this.name}"]`); if (!Array.isArray(data)) { diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/entity/SysUser.java b/shandan-system/src/main/java/com/keyware/shandan/system/entity/SysUser.java index 063ed58..209082e 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/system/entity/SysUser.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/entity/SysUser.java @@ -53,6 +53,12 @@ public class SysUser extends BaseEntity implements Serializable { @TableField(value = "VALID") private Boolean valid; + /** + * 数据密级 + */ + @TableField("SECRET_LEVEL") + private Integer secretLevel; + /** * 限制允许登录的IP集合 */ 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 00de7bf..6d45ba8 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 @@ -1,7 +1,9 @@ let form; -layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'util', 'dtree'], function () { +layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'dict', 'dtree'], function () { let layDate = layui.laydate; form = layui.form; + console.info(user); + layui.dict.setData('dict-secret-level', user); //日期选择器 layDate.render({ diff --git a/shandan-system/src/main/resources/view/sys/user/userEdit.html b/shandan-system/src/main/resources/view/sys/user/userEdit.html index 5e4e05f..d5d08a5 100644 --- a/shandan-system/src/main/resources/view/sys/user/userEdit.html +++ b/shandan-system/src/main/resources/view/sys/user/userEdit.html @@ -12,7 +12,13 @@ .layui-form-label { width: 150px !important; } + .dict-component{ + width: 100% !important; + } +
@@ -54,6 +60,13 @@
+
+ +
+
+
+