From 3e7479de6feb64d437192363c7e2c72dc12644a7 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:14:16 +0800
Subject: [PATCH] fix:87600

---
 .../impl/LawsMarketStandardServiceImpl.java       | 15 +++++++++++----
 .../src/main/resources/application-dev.yml        |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

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 65e16806..4ca5df8b 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
@@ -72,6 +72,12 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     public static final String CLASS = "entity";
     public static final String PARAMS = "params";
 
+
+    /**
+     * 其他管理员
+     */
+    @Value("${sys_role.other_admin}")
+    private List<String> otherAdmin;
     /**
      * 法规管理员
      */
@@ -160,6 +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.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)){
             queryWrapper.and(i->i.eq("ms.manifest_status",MarketStandardConstants.MANIFEST_STATUS_PUBLISH).or()
                     .eq("ms.author",sysUser.getId()));
@@ -223,6 +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.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(sysUser.getId(),lawsMarketStandardOld.getAuthor())){
             throw new JeroBootException("没有权限");
@@ -306,6 +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.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                     && !Objects.equals(sysUser.getId(),lawsMarketStandard.getAuthor())){
                 return Result.error("没有权限");
@@ -360,11 +369,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         }
         // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        log.info("=====" + !Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin));
-        log.info("=====" + !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin));
-        log.info("=====" + !Objects.equals(manifest.getAuthor(),sysUser.getId()));
-        log.info("=====" + !Objects.equals(manifest.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH));
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(manifest.getAuthor(),sysUser.getId())
                 && !Objects.equals(manifest.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
@@ -433,6 +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.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
             return Result.error("没有权限");
diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml
index 2375f269..37936837 100644
--- a/laws-single-startup/src/main/resources/application-dev.yml
+++ b/laws-single-startup/src/main/resources/application-dev.yml
@@ -556,6 +556,8 @@ sys_role:
   laws_admin: regulationAdmin
   # 超级管理员
   super_admin: superAdmin
+  # 其他管理员
+  other_admin: KFGLY,admin
 
 # 飞书对接:
 feishu: