From 4f6c7a11fb1ddd693de6b2f814ee571040634566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 22 Nov 2023 18:07:35 +0800 Subject: [PATCH] fix:78587 --- .../java/com/jero/common/api/vo/ResultCommon.java | 2 +- .../controller/LawsStandardSharingController.java | 11 +++++++++++ .../src/main/resources/i18n/messages.properties | 2 +- .../src/main/resources/i18n/messages_en.properties | 2 +- .../src/main/resources/i18n/messages_zh.properties | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index 00213fc0..e66ec1cb 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -68,7 +68,7 @@ public class ResultCommon { public static final String ROOT_NODE_CANNOT_BE_EDITED = "root.node.cannot.be.edited"; // 根节点不能编辑 - public static final String HORIZONTAL_TRANSGRESSION = "horizontal.transgression"; // 水平越权 + public static final String HORIZONTAL_TRANSGRESSION = "horizontal.transgression"; // 越权 public static final String SELECT_LEVEL_TWO_TREE_NODE = "select.level.two.tree.node"; // 请先选择二级及以下体系 diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index 0223ac48..5530dc87 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -1,5 +1,6 @@ package com.jero.modules.personal.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; @@ -295,6 +296,16 @@ public class LawsStandardSharingController extends JeroController listIds = Arrays.asList(map.get("ids").split(",")); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper queryLawsStandardSharing = new LambdaQueryWrapper<>(); + queryLawsStandardSharing.in(LawsStandardSharing::getId,listIds); + queryLawsStandardSharing.ne(LawsStandardSharing::getStandardId,sysUser.getId()); + long l = lawsStandardSharingService.count(queryLawsStandardSharing); + if(l > 0){ + throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION); + } + this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(","))); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 53a1c82e..8f9d5c38 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -39,7 +39,7 @@ cannot.close=Expired data that is not pending rectification cannot be closed no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91 -horizontal.transgression=\u6C34\u5E73\u8D8A\u6743 +horizontal.transgression=\u8D8A\u6743 select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB export.error=\u5BFC\u51FA\u9519\u8BEF import.error=\u5BFC\u5165\u9519\u8BEF diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 4430e053..fe4b9471 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -43,7 +43,7 @@ cannot.close=Expired data that is not pending rectification cannot be closed no.corresponding.record.found=No corresponding record found parameters.cannot.be.null=Parameters cannot be null root.node.cannot.be.edited=Root node cannot be edited -horizontal.transgression=Horizontal overstepping of authority +horizontal.transgression=overstepping of authority select.level.two.tree.node=Please select a level 2 or lower system first export.error=Export error import.error=Import error diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 6908310b..26c51ea5 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -42,7 +42,7 @@ cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u5DF2\u8FC7\u671F\u7684\u6570\u636E\ no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91 -horizontal.transgression=\u6C34\u5E73\u8D8A\u6743 +horizontal.transgression=\u8D8A\u6743 select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB` export.zip.archive.error=\u5BFC\u51FA\u9519\u8BEF import.zip.archive.error=\u5BFC\u5165\u9519\u8BEF