From 758fef806da65f7503a6c0c537590b14afa06c53 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 13 Nov 2023 11:15:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E9=BB=98=E8=AE=A4=E5=B8=A6=E5=87=BA=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseStandardAuthUserServiceImpl.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 63c51d54..b837a6de 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
@@ -22,8 +22,10 @@ import com.jero.modules.sys.entity.LawsGrade;
 import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService;
 import com.jero.modules.sys.service.ILawsGradeService;
 import com.jero.modules.sys.utils.UserUtils;
+import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.model.DepartIdModel;
+import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -72,6 +74,9 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
     @Resource
     private ILawsGradeService gradeService;
 
+    @Resource
+    private ISysDepartService sysDepartService;
+
 
     @Override
     public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) {
@@ -170,12 +175,15 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
             return;
         }
+        // 获取起草部门的Id
+        List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDepartName, draftDepartName));
         for (Map<String, Object> map : records) {
             String standardId = (String) map.get(FieldCommon.ID);
             Set<EnterpriseStandardAuthDept> curAuthSet = authDeptList.stream()
                     .filter(e -> e.getAuthDept() != null)
                     .filter(e -> StrUtil.isNotEmpty(e.getAuthDept()))
                     .filter(e -> e.getStandardId().equals(standardId))
+                    .filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId()))
                     .collect(Collectors.toSet());
             LawsEnterpriseStandard es = esMap.get(standardId);
             // 临时权限
@@ -282,12 +290,15 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             // 全部设置为有权限
             records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
         }
+        // 获取起草部门的Id
+        List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDepartName, draftDepartName));
         for (Map<String, Object> map : records) {
             String standardId = (String) map.get(FieldCommon.ID);
             Set<EnterpriseStandardAuthDept> curAuthSet = authDeptList.stream()
                     .filter(e -> e.getAuthDept() != null)
                     .filter(e -> StrUtil.isNotEmpty(e.getAuthDept()))
                     .filter(e -> e.getStandardId().equals(standardId))
+                    .filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId()))
                     .collect(Collectors.toSet());
             LawsEnterpriseStandard es = esMap.get(standardId);
             // 临时权限
@@ -509,12 +520,14 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
             // 全部设置为有权限
             return true;
         }
-
+        // 获取起草部门的Id
+        List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDepartName, draftDepartName));
         String finalStandardId = standardId;
         Set<EnterpriseStandardAuthDept> curAuthSet = authDeptList.stream()
                 .filter(e -> e.getAuthDept() != null)
                 .filter(e -> StrUtil.isNotEmpty(e.getAuthDept()))
                 .filter(e -> e.getStandardId().equals(finalStandardId))
+                .filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId()))
                 .collect(Collectors.toSet());
 
         LawsEnterpriseStandard es = enterpriseStandardService.getById(standardId);