From 8da7c908e0ca89e8bc388c90c6bbfa6b1695cd06 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 30 Nov 2021 11:38:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=8F=AF=E8=A7=81=E6=80=A7=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/controller/backend/HumanCostController.java | 4 ++-- .../palmte/work/controller/backend/ProjectController.java | 1 + .../java/cn/palmte/work/service/HumanCostService.java | 2 +- src/main/resources/templates/admin/project_list.ftl | 8 ++++---- src/main/resources/templates/admin/project_settle_add.ftl | 2 +- .../resources/templates/admin/project_settle_edit.ftl | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/HumanCostController.java b/src/main/java/cn/palmte/work/controller/backend/HumanCostController.java index 138c9da..a666035 100644 --- a/src/main/java/cn/palmte/work/controller/backend/HumanCostController.java +++ b/src/main/java/cn/palmte/work/controller/backend/HumanCostController.java @@ -60,12 +60,12 @@ public class HumanCostController extends BaseController{ Admin admin = getAdmin(); int roleLevel = admin.getRoleLevel(); List selfProjects = projectRepository.findByCreator(admin.getId(), new Date()); - if (roleLevel <= 2 || roleLevel == 4) { + if (roleLevel <= 3 || roleLevel == 6) { model.put("deptVary", 1); model.put("deptList", deptRepository.findAll()); model.put("projectList", projectRepository.findAll()); model.put("showSalary", 1); - } else if (roleLevel == 3) { + } else if (roleLevel == 4 || roleLevel == 5) { model.put("deptVary", -1); model.put("deptList", new ArrayList<>()); model.put("projectList", projectRepository.findByDeptId(admin.getDeptId())); diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index be1b8d6..c467e1c 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -80,6 +80,7 @@ public class ProjectController extends BaseController { //当前登录人的角色类型 model.put("keywords", keywords); model.put("adminId", InterfaceUtil.getAdminId()); + model.put("admin", InterfaceUtil.getAdmin()); model.put("deptList", deptService.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); model.put("pager", projectService.list(searchInfo, pageNumber, pageSize)); diff --git a/src/main/java/cn/palmte/work/service/HumanCostService.java b/src/main/java/cn/palmte/work/service/HumanCostService.java index dcb8a9d..8362abf 100644 --- a/src/main/java/cn/palmte/work/service/HumanCostService.java +++ b/src/main/java/cn/palmte/work/service/HumanCostService.java @@ -250,7 +250,7 @@ public class HumanCostService { } Admin admin = InterfaceUtil.getAdmin(); List projectList = null; - if (admin.getRoleLevel() <= 2 || admin.getRoleLevel() == 4) { + if (admin.getRoleLevel() <= 3 || admin.getRoleLevel() == 6) { String sql = "select proj.id, proj.name from project proj where (proj.status = ? or (proj.status = ? and proj.approve_status_budget = ?) or (proj.status = ? and proj.approve_status_final <> ?)) order by proj.id asc"; projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, Project.STATUS_FINAL, 2); } else { diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 6990191..8af61f2 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -238,7 +238,7 @@ <#-- --> <#-- 项目等于预算状态、预算审核等于通过状态 --> - <#if (list.status==5 && list.approveStatusBudget=2) || (list.status=10 && list.approveStatusSettle=2) > + <#if admin.getRoleLevel() == 6 && ((list.status==5 && list.approveStatusBudget=2) || (list.status=10 && list.approveStatusSettle=2)) >