From 7e6240ee840c5a3ccd70b69d09e8bb2c36f2b540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 31 Jul 2024 17:54:26 +0800
Subject: [PATCH] fix:87898

---
 .../impl/LawsMarketStandardDetailServiceImpl.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 5f7c05c9..72e5e51f 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
@@ -529,11 +529,11 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public Result<?> deleteById(String id) {
-        checkData(id);
         LawsMarketStandardDetail lawsMarketStandardDetail = getById(id);
         if(Objects.isNull(lawsMarketStandardDetail)){
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
+        checkData(id,lawsMarketStandardDetail.getManifestId());
         removeById(id);
         // 更细状态
         marketStandardService.updateStatus(lawsMarketStandardDetail.getManifestId());
@@ -543,11 +543,11 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public Result<?> deleteBatchById(String ids) {
-        checkData(ids);
         LawsMarketStandardDetail lawsMarketStandardDetail = getById(ids.split(",")[0]);
         if(Objects.isNull(lawsMarketStandardDetail)){
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
+        checkData(ids,lawsMarketStandardDetail.getManifestId());
         // 更细状态
         marketStandardService.updateStatus(lawsMarketStandardDetail.getManifestId());
         removeByIds(Arrays.asList(ids.split(",")));
@@ -567,7 +567,11 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
     }
 
     // 验证数据权限
-    private void checkData(String id) {
+    private void checkData(String id,String manifestId) {
+        LawsMarketStandard lawsMarketStandard = marketStandardService.getById(manifestId);
+        if(Objects.isNull(lawsMarketStandard)){
+            throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
         queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getCreateBy, sysUser.getUsername());
@@ -575,7 +579,8 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         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)) {
+                && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
+                && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())) {
             throw new JeroBootException(ResultCommon.NO_PERMISSION);
         }
     }