From 9d7dc4d12c5402a750079ca15528a4638eb2b1db Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Tue, 6 Sep 2022 17:48:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=BF=E6=8E=A5=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E7=9B=B8=E5=90=8C=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=9A=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/controller/backend/ProjectController.java | 9 +++++---- src/main/java/cn/palmte/work/model/AdminRepository.java | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) 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 f68cae7..9e63d29 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -100,11 +100,12 @@ public class ProjectController extends BaseController { Map model) { //当前登录人的角色类型 model.put("keywords", keywords); - model.put("adminId", InterfaceUtil.getAdminId()); - model.put("admin", InterfaceUtil.getAdmin()); + Admin admin = InterfaceUtil.getAdmin(); + model.put("adminId", admin.getId()); + model.put("admin", admin); model.put("deptList", deptService.findAll()); - List adminList = adminRepository.getAllEnable(); - adminList = adminList.stream().filter(a-> !"admin".equals(a.getUserName())).collect(Collectors.toList()); + List adminList = adminRepository.findByRoleId(admin.getRoleId()); + adminList = adminList.stream().filter(a-> !admin.getId().equals(a.getId())).collect(Collectors.toList()); model.put("adminList", adminList); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); model.putIfAbsent("extend", "1"); diff --git a/src/main/java/cn/palmte/work/model/AdminRepository.java b/src/main/java/cn/palmte/work/model/AdminRepository.java index ef280c6..e640662 100644 --- a/src/main/java/cn/palmte/work/model/AdminRepository.java +++ b/src/main/java/cn/palmte/work/model/AdminRepository.java @@ -46,4 +46,7 @@ public interface AdminRepository extends JpaRepository { @Query("from Admin where isDeleted=0 AND enabled=1") List getAllEnable(); + @Query("from Admin where isDeleted=0 AND enabled=1 AND roleId=?1") + List findByRoleId(int roleId); + }