From a9027f2973872c53971cdc2122632bffab91e98a Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 18 Mar 2025 11:34:00 +0800
Subject: [PATCH] SUPER_ADMIN_ROLE_KEY

---
 .../com/bonus/common/houqin/constant/GlobalConstants.java     | 4 ++++
 .../allocation/canteen/service/impl/AllocAreaServiceImpl.java | 4 ++++
 .../main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/GlobalConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/GlobalConstants.java
index e8e52c31..952d43dc 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/GlobalConstants.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/GlobalConstants.java
@@ -5,6 +5,10 @@ package com.bonus.common.houqin.constant;
  * @author bns_han
  */
 public class GlobalConstants {
+    /**
+     * super admin role key
+     */
+    public static final String SUPER_ADMIN_ROLE_KEY = "admin";
     /**
      * 字符串 MSIE
      */
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocAreaServiceImpl.java
index aeacb845..ec8945d5 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocAreaServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocAreaServiceImpl.java
@@ -31,6 +31,7 @@ import com.bonus.canteen.core.common.utils.TreeNodeUtil;
 import com.bonus.canteen.core.order.mq.MqUtil;
 import com.bonus.canteen.core.order.utils.LeNumUtil;
 import com.bonus.common.core.exception.ServiceException;
+import com.bonus.common.houqin.constant.GlobalConstants;
 import com.bonus.common.houqin.constant.LeConstants;
 import com.bonus.common.houqin.i18n.I18n;
 import com.bonus.common.houqin.utils.LeBeanUtil;
@@ -202,6 +203,9 @@ public class AllocAreaServiceImpl extends ServiceImpl<AllocAreaMapper, AllocArea
    public List<Tree<Long>> getSystemAuthAreaTree() {
       MgrUserAuthPO mgrUserAuthPO = this.mgrAuthApi.getUserAuthPO();
       List<AllocAreaTreeVO> areaList = ((AllocAreaMapper)this.baseMapper).listSystemArea(TenantContextHolder.getTenantId());
+      if (GlobalConstants.SUPER_ADMIN_ROLE_KEY.equals(mgrUserAuthPO.getRoleCode())) {
+         areaList = new ArrayList<>();
+      }
       List<AllocAreaTreeVO> filterAreaTreeList = ((AllocAreaMapper)this.baseMapper).listAllTreeArea();
       if (CollUtil.isNotEmpty(filterAreaTreeList)) {
          List<Long> filterAreaIdList = (List)filterAreaTreeList.stream().map(BaseTreeNode::getId).collect(Collectors.toList());
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
index 01e45ca0..39328eba 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
@@ -24,6 +24,7 @@ import com.bonus.canteen.core.merchant.api.MercMerchantApi;
 import com.bonus.canteen.core.merchant.entity.MercMerchant;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.houqin.constant.DelFlagEnum;
+import com.bonus.common.houqin.constant.GlobalConstants;
 import com.bonus.common.houqin.constant.LeConstants;
 import com.bonus.common.houqin.i18n.I18n;
 import com.bonus.common.security.utils.SecurityUtils;
@@ -89,7 +90,7 @@ public class MgrAuthApi {
       String roleCodeResult = null;
       for (String roleCode : roleSet) {
          roleCodeResult = roleCode;
-         if (roleCode.startsWith(RoleCodeV2Enum.ROLE_ADMIN.key()) || "admin".equals(roleCode)) {
+         if (roleCode.startsWith(RoleCodeV2Enum.ROLE_ADMIN.key()) || GlobalConstants.SUPER_ADMIN_ROLE_KEY.equals(roleCode)) {
             roleType = MgrRoleTypeV2Enum.ROLE_ADMIN.getKey();
 //            if (CharSequenceUtil.split(roleCode, "&&").size() > 1) {
 //               roleType = MgrRoleTypeV2Enum.ROLE_ADMIN.getKey();