From d6b3ff69895d64e5e0e9c5653b3eb5190bea7f5d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 11 Jan 2024 11:44:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20hasEsAuth=E6=96=B9=E6=B3=95=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=890=E7=BA=A7=E6=9D=83=E9=99=90BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...EnterpriseStandardAuthUserServiceImpl.java | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 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 5139d6b1..1dd1a9df 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
@@ -342,6 +342,11 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             }
             // 等级分类
             String gradeClassification = es.getGradeClassification();
+            // 全公司可以看
+            if ("1".equals(gradeClassification)) {
+                map.put(FieldCommon.DETAIL_FLAG, true);
+                continue;
+            }
             // 授权部门
             if (!curAuthSet.isEmpty()) {
                 // 如果授权部门不等于0
@@ -349,33 +354,34 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
                     map.put(FieldCommon.DETAIL_FLAG, true);
                     continue;
                 }
-            } else {
-                // 企标等级分类级别可查看部门
-                if ("2".equals(gradeClassification)) {
-                    if (levelOneDeptIds.stream().anyMatch(departIds::contains)) {
-                        map.put(FieldCommon.DETAIL_FLAG, true);
-                        continue;
-                    }
-                }
-                if ("3".equals(gradeClassification)) {
-                    if (levelTwoDeptIds.stream().anyMatch(departIds::contains)) {
-                        map.put(FieldCommon.DETAIL_FLAG, true);
-                        continue;
-                    }
-                }
-                if ("4".equals(gradeClassification)) {
-                    // 主起草部门有企标的查看权限
-                    if (!departNames.isEmpty() && departNames.contains(mainDraftUnit)) {
-                        // 全部设置为有权限
-                        map.put(FieldCommon.DETAIL_FLAG, true);
-                        continue;
-                    }
+            }
+            // 企标等级分类级别可查看部门
+            if ("2".equals(gradeClassification)) {
+                if (levelOneDeptIds.stream().anyMatch(departIds::contains)) {
+                    map.put(FieldCommon.DETAIL_FLAG, true);
+                    continue;
                 }
             }
+            if ("3".equals(gradeClassification)) {
+                if (levelTwoDeptIds.stream().anyMatch(departIds::contains)) {
+                    map.put(FieldCommon.DETAIL_FLAG, true);
+                    continue;
+                }
+            }
+            if ("4".equals(gradeClassification)) {
+                // 主起草部门有企标的查看权限
+                if (!departNames.isEmpty() && departNames.contains(mainDraftUnit)) {
+                    // 全部设置为有权限
+                    map.put(FieldCommon.DETAIL_FLAG, true);
+                    continue;
+                }
+            }
+
             map.put(FieldCommon.DETAIL_FLAG, false);
         }
         // 遍历map
-        for (Map<String, Object> map : records) {
+        for (
+                Map<String, Object> map : records) {
             if (!(boolean) map.get(FieldCommon.DETAIL_FLAG)) {
                 return false;
             }