diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java index f043e692..e2f56a09 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java @@ -147,7 +147,7 @@ public class MarketStandardDetailController { @RequiresPermissions("marketStandard:detail:operate") @Translation public Result getById(@RequestParam("id") String id) { - return Result.OK(lawsMarketStandardDetailService.getById(id)); + return lawsMarketStandardDetailService.queryById(id); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java index 3f2e7a39..81b58a28 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java @@ -95,4 +95,11 @@ public interface ILawsMarketStandardDetailService extends IService queryById(String id); } 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 5c9c53fc..085bd18d 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 @@ -484,6 +484,26 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl queryById(String id) { + LawsMarketStandardDetail lawsMarketStandardDetail = getById(id); + if(Objects.isNull(lawsMarketStandardDetail)){ + return Result.error("数据不存在"); + } + LawsMarketStandard lawsMarketStandard = marketStandardService.getById(lawsMarketStandardDetail.getManifestId()); + if(Objects.isNull(lawsMarketStandard)){ + return Result.error("数据不存在"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin) + && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin) + && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId()) + && !Objects.equals(lawsMarketStandard.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){ + return Result.error("没有权限"); + } + return Result.OK(lawsMarketStandardDetail); + } }