From 662e7c36e5168cabf4990d0ed67367532da78a61 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 10 Nov 2023 20:09:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=88=86=E7=B1=BB=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...EnterpriseStandardAuthUserServiceImpl.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
index 95dff0b3..ebae907f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
@@ -104,6 +104,13 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, false));
         SysUser currentUser = sysUserService.getById(UserUtils.getUserId());
         String userId = currentUser.getId();
+        // 管理员有所有企标的权限
+        List<String> roleList = sysUserRoleService.getRole(currentUser.getUsername());
+        if (roleList != null && roleList.contains(FieldCommon.ROLE_ADMIN)) {
+            records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
+            return;
+        }
+
         List<DepartIdModel> departIdModels = sysUserDepartService.queryDepartIdsOfUser(userId);
         List<String> departIds = departIdModels.stream().map(DepartIdModel::getKey).collect(Collectors.toList());
         List<String> departNames = departIdModels.stream().map(DepartIdModel::getTitle).collect(Collectors.toList());
@@ -153,12 +160,12 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             // 等级分类
             String gradeClassification = es.getGradeClassification();
             // 全公司可以看
-            if (gradeClassification.equals("1")) {
+            if ("1".equals(gradeClassification)) {
                 map.put(FieldCommon.DETAIL_FLAG, true);
                 continue;
             }
             // 企标等级分类级别可查看部门
-            if (gradeClassification.equals("2") || gradeClassification.equals("3")) {
+            if ("2".equals(gradeClassification) || "3".equals(gradeClassification)) {
                 if (levelDeptIds.stream().anyMatch(departIds::contains)) {
                     map.put(FieldCommon.DETAIL_FLAG, true);
                     continue;
@@ -360,6 +367,14 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
 
     @Override
     public boolean detailPermissionByUser(String standardId, String standardNumber, String userId) {
+        // 管理员有所有企标的权限
+        SysUser currentUser = sysUserService.getById(userId);
+        // 管理员有所有企标的权限
+        List<String> roleList = sysUserRoleService.getRole(currentUser.getUsername());
+        if (roleList != null && roleList.contains(FieldCommon.ROLE_ADMIN)) {
+            return true;
+        }
+
         List<DepartIdModel> departIdModels = sysUserDepartService.queryDepartIdsOfUser(userId);
         List<String> departIds = departIdModels.stream().map(DepartIdModel::getKey).collect(Collectors.toList());
         List<String> departNames = departIdModels.stream().map(DepartIdModel::getTitle).collect(Collectors.toList());