From 10230486af73e5544e73516c56db8343253f460e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 3 Apr 2025 15:34:25 +0800
Subject: [PATCH] 11

---
 .../pjcloud/common/core/constant/CommonRoleConstant.java    | 6 ++++++
 .../pjcloud/hard/service/impl/HardManagerServiceImpl.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java
index 13c234d5d..31443ab46 100644
--- a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java
+++ b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/CommonRoleConstant.java
@@ -11,6 +11,12 @@ public interface CommonRoleConstant {
     // 管理员
     String ROLE_ADMIN = "ROLE_ADMIN";
 
+    // 机关管理员
+    String JG_ADMIN = "JG_ADMIN";
+
+    // 财务管理员
+    String CANTEEN_FINANCE = "CANTEEN_FINANCE";
+
     // 部门管理员
     String DEPT_ADMIN = "DEPT_ADMIN";
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
index 3ff254153..cee7939a3 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
@@ -218,7 +218,7 @@ public class HardManagerServiceImpl extends ServiceImpl<HardManagerMapper, HardM
         String[] roles = userInfo.getRoleCodes();
         if (roles.length == 0) return result;
         List<String> roleList = Arrays.asList(roles);
-        if (roleList.contains(CommonRoleConstant.ROLE_ADMIN)) {
+        if (roleList.contains(CommonRoleConstant.ROLE_ADMIN) || roleList.contains(CommonRoleConstant.JG_ADMIN) || roleList.contains(CommonRoleConstant.CANTEEN_FINANCE)) {
             result.setCanteenView(true);
             result.setSupermarket(true);
             return result;