diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/UploadController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/UploadController.java index 34c514b..67603d3 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/UploadController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/UploadController.java @@ -84,15 +84,8 @@ public class UploadController { String originalFileName = file.getOriginalFilename(); String fileExtension = originalFileName != null && originalFileName.contains(".") ? originalFileName.split("\\.")[originalFileName.split("\\.").length - 1] : ""; - if (!"xls".equalsIgnoreCase(fileExtension) - && !"xlsx".equalsIgnoreCase(fileExtension) - && !"doc".equalsIgnoreCase(fileExtension) - && !"docx".equalsIgnoreCase(fileExtension) - && !"pdf".equalsIgnoreCase(fileExtension) - && !"jpg".equalsIgnoreCase(fileExtension) - && !"jpeg".equalsIgnoreCase(fileExtension) - && !"png".equalsIgnoreCase(fileExtension)) { - ar.setFailMsg("文件类型错误,请上传xls/xlsx/doc/docx/jpg/jpeg/png/pdf格式的文件"); + if (!"jpg".equalsIgnoreCase(fileExtension)) { + ar.setFailMsg("文件类型错误,请上传jpg格式的文件"); return ar; } } diff --git a/src/main/resources/static/js/evaluate/org/orgList.js b/src/main/resources/static/js/evaluate/org/orgList.js index 92f8c4a..6f0bf26 100644 --- a/src/main/resources/static/js/evaluate/org/orgList.js +++ b/src/main/resources/static/js/evaluate/org/orgList.js @@ -121,6 +121,11 @@ function initTreeTable() { let html = ""; if ([1, 2, 3, 4].includes(d.level)) { + if (user.roleId == 1) { + html += '新增'; + html += ' '; + html += '修改名称'; + } if (user.roleId == 6 || user.roleId == 5) { html += '新增'; html += ' '; @@ -140,6 +145,9 @@ function initTreeTable() { } if (d.level === 5) { + if (user.roleId == 1) { + html += '更换班长'; + } if (user.roleId == 6 || user.roleId == 5) { html += '更换班长'; } diff --git a/src/main/resources/static/js/evaluate/person/person.js b/src/main/resources/static/js/evaluate/person/person.js index 040ffd8..4328628 100644 --- a/src/main/resources/static/js/evaluate/person/person.js +++ b/src/main/resources/static/js/evaluate/person/person.js @@ -51,13 +51,13 @@ function initTreeTable() { unresize: true, align: "center", }, - { + /*{ field: "sex", title: "性别", width: "10%", unresize: true, align: "center", - }, + },*/ // { // field: "idCard", // title: "身份证号码", diff --git a/src/main/resources/static/pages/evaluate/passwordBook/personnelPasswordBook.html b/src/main/resources/static/pages/evaluate/passwordBook/personnelPasswordBook.html index 036d92d..fe9fb2b 100644 --- a/src/main/resources/static/pages/evaluate/passwordBook/personnelPasswordBook.html +++ b/src/main/resources/static/pages/evaluate/passwordBook/personnelPasswordBook.html @@ -2,7 +2,7 @@
-