From 9b631000bfe9c82bfb2804d745f321adbeadec23 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 3 Jan 2024 14:31:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=2078448=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86--=E5=88=9B=E5=BB=BA=E4=BA=BA=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=89=E7=BA=A7=E4=B8=BA3=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=8F=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...EnterpriseStandardAuthUserServiceImpl.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 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 66887e86..a4b178d0 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
@@ -233,7 +233,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
                 continue;
             }
             // 授权部门
-            if (curAuthSet.size() > 0) {
+            if (!curAuthSet.isEmpty()) {
                 // 如果授权部门不等于0
                 if (curAuthSet.stream().map(EnterpriseStandardAuthDept::getAuthDept).anyMatch(departIds::contains)) {
                     map.put(FieldCommon.DETAIL_FLAG, true);
@@ -346,7 +346,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             // 等级分类
             String gradeClassification = es.getGradeClassification();
             // 授权部门
-            if (curAuthSet.size() > 0) {
+            if (!curAuthSet.isEmpty()) {
                 // 如果授权部门不等于0
                 if (curAuthSet.stream().map(EnterpriseStandardAuthDept::getAuthDept).anyMatch(departIds::contains)) {
                     map.put(FieldCommon.DETAIL_FLAG, true);
@@ -575,16 +575,20 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         }
         // 等级分类
         String gradeClassification = es.getGradeClassification();
+        String userName = currentUser.getUsername();
+        String creatUser = es.getCreateBy();
+        // 创建人可以看
+        if (userName.equals(creatUser)) {
+            return true;
+        }
         // 全公司可以看
         if ("1".equals(gradeClassification)) {
             return true;
         }
         // 授权部门
-        if (curAuthSet.size() > 0) {
+        if (!curAuthSet.isEmpty()) {
             // 如果授权部门不等于0
-            if (curAuthSet.stream().map(EnterpriseStandardAuthDept::getAuthDept).anyMatch(departIds::contains)) {
-                return true;
-            }
+            return curAuthSet.stream().map(EnterpriseStandardAuthDept::getAuthDept).anyMatch(departIds::contains);
         } else {
             // 企标等级分类级别可查看部门
             if ("2".equals(gradeClassification)) {
@@ -599,10 +603,8 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             }
             if ("4".equals(gradeClassification)) {
                 // 主起草部门有企标的查看权限
-                if (!departNames.isEmpty() && departNames.contains(mainDraftUnit)) {
-                    // 全部设置为有权限
-                    return true;
-                }
+                // 全部设置为有权限
+                return !departNames.isEmpty() && departNames.contains(mainDraftUnit);
             }
         }
         return false;