ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:78587

Browse Source
This commit is contained in:
梁琦涛
2023-11-23 09:21:20 +08:00
parent 4f6c7a11fb
commit 115b8d57af
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java
+1 -1
View File
@@ -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"; // 请先选择二级及以下体系
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+9
View File
@@ -210,6 +210,15 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<LawsStandardCollection> queryLawsStandardCollection = new LambdaQueryWrapper<>();
queryLawsStandardCollection.eq(LawsStandardCollection::getId,map.get("id"));
queryLawsStandardCollection.ne(LawsStandardCollection::getCollectorId,sysUser);
long l = lawsStandardCollectionService.count(queryLawsStandardCollection);
if(l > 0){
throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION);
}
lawsStandardCollectionService.removeById(map.get("id"));
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
laws-single-startup/src/main/resources/i18n/messages.properties
+1 -1
View File
@@ -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=\u8D8A\u6743
horizontal.transgression=\u6C34\u5E73\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
laws-single-startup/src/main/resources/i18n/messages_en.properties
+1 -1
View File
@@ -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=overstepping of authority
horizontal.transgression=Horizontal 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
laws-single-startup/src/main/resources/i18n/messages_zh.properties
+1 -1
View File
@@ -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=\u8D8A\u6743
horizontal.transgression=\u6C34\u5E73\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