From 3ff8dd11ab13d0649966fa1a3772c519056aee41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 26 Jul 2024 17:45:46 +0800
Subject: [PATCH] fix:87600

---
 .../impl/LawsMarketStandardDetailServiceImpl.java  | 14 ++++++++++++++
 .../impl/LawsMarketStandardServiceImpl.java        | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
index e0426cbb..8aad67a0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
@@ -70,6 +70,12 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
 
     private static final String NO_PERMISSIONS = "没有权限";
 
+
+    /**
+     * 其他管理员
+     */
+    @Value("${sys_role.other_admin}")
+    private String otherAdmin;
     /**
      * 法规管理员
      */
@@ -98,6 +104,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
             // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                    && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())
                 && !Objects.equals(lawsMarketStandard.getManifestStatus(),
@@ -164,6 +171,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
             return Result.error(NO_PERMISSIONS);
@@ -404,6 +412,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
             return Result.error(NO_PERMISSIONS);
@@ -431,6 +440,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
             return Result.error(NO_PERMISSIONS);
@@ -477,6 +487,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
             return Result.error(NO_PERMISSIONS);
@@ -543,6 +554,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getId, Arrays.asList(id.split(",")));
         long l = count(queryLawsMarketStandardDetail);
         if (l == 0 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)) {
             throw new JeroBootException(NO_PERMISSIONS);
         }
@@ -560,6 +572,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
             && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
             && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())
             && !Objects.equals(lawsMarketStandard.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
@@ -583,6 +596,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
             // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                    && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                     && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                     && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())
                     && !Objects.equals(lawsMarketStandard.getManifestStatus(),
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 4ca5df8b..89db1583 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -166,7 +166,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-            && !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
+            && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)){
             queryWrapper.and(i->i.eq("ms.manifest_status",MarketStandardConstants.MANIFEST_STATUS_PUBLISH).or()
                     .eq("ms.author",sysUser.getId()));
@@ -230,7 +230,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(sysUser.getId(),lawsMarketStandardOld.getAuthor())){
             throw new JeroBootException("没有权限");
@@ -314,7 +314,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         }else{
             // 状态未发布的数据只能作者和管理员查看、编辑、删除
             if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                    && !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
+                    && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                     && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                     && !Objects.equals(sysUser.getId(),lawsMarketStandard.getAuthor())){
                 return Result.error("没有权限");
@@ -370,7 +370,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(manifest.getAuthor(),sysUser.getId())
                 && !Objects.equals(manifest.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
@@ -439,7 +439,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
-                && !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
+                && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
             return Result.error("没有权限");