From 319ba75cae7b391518f32b02865571becf346557 Mon Sep 17 00:00:00 2001 From: sugy <455459989@qq.com> Date: Wed, 31 Dec 2025 17:05:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/{LdRoleController.java => RoleController.java} | 3 +-- src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) rename src/main/java/com/nov/KgLowDurable/controller/{LdRoleController.java => RoleController.java} (96%) diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdRoleController.java b/src/main/java/com/nov/KgLowDurable/controller/RoleController.java similarity index 96% rename from src/main/java/com/nov/KgLowDurable/controller/LdRoleController.java rename to src/main/java/com/nov/KgLowDurable/controller/RoleController.java index 048bace..5b7673f 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdRoleController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/RoleController.java @@ -2,7 +2,6 @@ package com.nov.KgLowDurable.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nov.KgLowDurable.pojo.entity.Role; -import com.nov.KgLowDurable.pojo.entity.User; import com.nov.KgLowDurable.pojo.vo.GrantVO; import com.nov.KgLowDurable.pojo.vo.RoleVO; import com.nov.KgLowDurable.service.IRoleService; @@ -26,7 +25,7 @@ import java.util.Map; @AllArgsConstructor @RequestMapping("/role") @Api(value = "角色", description = "角色") -public class LdRoleController { +public class RoleController { private final IRoleService roleService; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java index 9c86ea4..cb8bfe5 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java @@ -27,7 +27,6 @@ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; From c9708e01e03234d5a2852614954427fcbef8d4ab Mon Sep 17 00:00:00 2001 From: sugy <455459989@qq.com> Date: Mon, 5 Jan 2026 10:45:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RoleController.java | 6 +-- .../nov/KgLowDurable/mapper/MenuMapper.java | 25 ----------- .../nov/KgLowDurable/mapper/RoleMapper.java | 25 ----------- .../KgLowDurable/mapper/RoleMenuMapper.java | 25 ----------- .../KgLowDurable/mapper/TopMenuMapper.java | 25 ----------- .../mapper/TopMenuSettingMapper.java | 25 ----------- .../nov/KgLowDurable/pojo/dto/MenuDTO.java | 25 ----------- .../nov/KgLowDurable/pojo/dto/RoleDTO.java | 25 ----------- .../KgLowDurable/pojo/dto/RoleMenuDTO.java | 25 ----------- .../nov/KgLowDurable/pojo/entity/Menu.java | 25 ----------- .../nov/KgLowDurable/pojo/entity/Role.java | 25 ----------- .../KgLowDurable/pojo/entity/RoleMenu.java | 25 ----------- .../nov/KgLowDurable/pojo/entity/TopMenu.java | 25 ----------- .../com/nov/KgLowDurable/pojo/vo/MenuVO.java | 25 ----------- .../nov/KgLowDurable/pojo/vo/RoleMenuVO.java | 25 ----------- .../com/nov/KgLowDurable/pojo/vo/RoleVO.java | 25 ----------- .../KgLowDurable/service/IMenuService.java | 25 ----------- .../service/IRoleMenuService.java | 25 ----------- .../KgLowDurable/service/IRoleService.java | 25 ----------- .../KgLowDurable/service/ITopMenuService.java | 25 ----------- .../service/ITopMenuSettingService.java | 25 ----------- .../service/Impl/MenuServiceImpl.java | 28 +------------ .../service/Impl/RoleMenuServiceImpl.java | 25 ----------- .../service/Impl/RoleServiceImpl.java | 42 ++++--------------- .../service/Impl/TopMenuServiceImpl.java | 25 ----------- .../Impl/TopMenuSettingServiceImpl.java | 25 ----------- .../KgLowDurable/wrapper/LdDictWrapper.java | 25 ----------- .../nov/KgLowDurable/wrapper/MenuWrapper.java | 25 ----------- .../nov/KgLowDurable/wrapper/RoleWrapper.java | 25 ----------- 29 files changed, 13 insertions(+), 713 deletions(-) diff --git a/src/main/java/com/nov/KgLowDurable/controller/RoleController.java b/src/main/java/com/nov/KgLowDurable/controller/RoleController.java index 5b7673f..366d19d 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/RoleController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/RoleController.java @@ -3,11 +3,9 @@ package com.nov.KgLowDurable.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nov.KgLowDurable.pojo.entity.Role; import com.nov.KgLowDurable.pojo.vo.GrantVO; -import com.nov.KgLowDurable.pojo.vo.RoleVO; import com.nov.KgLowDurable.service.IRoleService; import com.nov.KgLowDurable.util.Condition; import com.nov.KgLowDurable.util.Result; -import com.nov.KgLowDurable.wrapper.RoleWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -47,10 +45,10 @@ public class RoleController { @ApiImplicitParam(name = "roleAlias", value = "角色别名") }) @ApiOperation(value = "列表", notes = "传入role") - public Result> list(@ApiParam(hidden = true) @RequestParam Map role) { + public Result> list(@ApiParam(hidden = true) @RequestParam Map role) { QueryWrapper queryWrapper = Condition.getQueryWrapper(role, Role.class); List list = roleService.list(queryWrapper); - return Result.OK(RoleWrapper.build().listNodeVO(list)); + return Result.OK(list); } /** * 新增或修改 diff --git a/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java index a485a45..697f04d 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/RoleMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/RoleMapper.java index 2490693..6bd366a 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/RoleMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/RoleMapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/RoleMenuMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/RoleMenuMapper.java index da9aac3..7eb9127 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/RoleMenuMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/RoleMenuMapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/TopMenuMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/TopMenuMapper.java index 42b8780..2b2d4de 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/TopMenuMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/TopMenuMapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/TopMenuSettingMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/TopMenuSettingMapper.java index d28834b..2b9b881 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/TopMenuSettingMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/TopMenuSettingMapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java index 93eb63a..b7cf6d3 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.dto; import lombok.Data; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleDTO.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleDTO.java index bf537e5..c5abf8b 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleDTO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleDTO.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.dto; import com.nov.KgLowDurable.pojo.entity.Role; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleMenuDTO.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleMenuDTO.java index 44e3ef4..6a36faf 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleMenuDTO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/RoleMenuDTO.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.dto; import com.nov.KgLowDurable.pojo.entity.RoleMenu; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/Menu.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/Menu.java index 71d0fe7..d5725c3 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/Menu.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/Menu.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java index cb8bfe5..84855c0 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/Role.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/RoleMenu.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/RoleMenu.java index 6026078..d16b18c 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/RoleMenu.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/RoleMenu.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/TopMenu.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/TopMenu.java index ed167b8..bc0abee 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/TopMenu.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/TopMenu.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java index 46c1a4c..a2ba682 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.vo; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleMenuVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleMenuVO.java index 48b9e07..a373829 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleMenuVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleMenuVO.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.vo; import com.nov.KgLowDurable.annotation.Schema; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleVO.java index caab636..a9239f2 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/RoleVO.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.pojo.vo; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/com/nov/KgLowDurable/service/IMenuService.java b/src/main/java/com/nov/KgLowDurable/service/IMenuService.java index a324f40..7ff446a 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IMenuService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IMenuService.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/nov/KgLowDurable/service/IRoleMenuService.java b/src/main/java/com/nov/KgLowDurable/service/IRoleMenuService.java index 9a237a5..8300417 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IRoleMenuService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IRoleMenuService.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/nov/KgLowDurable/service/IRoleService.java b/src/main/java/com/nov/KgLowDurable/service/IRoleService.java index 01df1b0..0cddf27 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IRoleService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IRoleService.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/nov/KgLowDurable/service/ITopMenuService.java b/src/main/java/com/nov/KgLowDurable/service/ITopMenuService.java index 21f85bc..e04e4fa 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ITopMenuService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ITopMenuService.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service; diff --git a/src/main/java/com/nov/KgLowDurable/service/ITopMenuSettingService.java b/src/main/java/com/nov/KgLowDurable/service/ITopMenuSettingService.java index aa8cfd3..dc2b58e 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ITopMenuSettingService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ITopMenuSettingService.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java index 7787d1f..cda0aa4 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java @@ -1,34 +1,10 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nov.KgLowDurable.common.TreeNode; +import com.nov.KgLowDurable.constant.RoleConstant; import com.nov.KgLowDurable.exception.ServiceException; import com.nov.KgLowDurable.mapper.MenuMapper; import com.nov.KgLowDurable.pojo.dto.MenuDTO; @@ -93,7 +69,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM List

roleMenus = null; Role role=roleService.getById(roleId); // 超级管理员并且不是顶部菜单请求则返回全部菜单 - if (Func.isEmpty(topMenuId)) { + if ((Func.isEmpty(roleId)||role.getCode().equals(RoleConstant.ADMINISTRATOR))&&Func.isEmpty(topMenuId)) { roleMenus = allMenus; } // 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单 diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/RoleMenuServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/RoleMenuServiceImpl.java index 208fccb..98b5754 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/RoleMenuServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/RoleMenuServiceImpl.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java index 9949b65..1cf6c24 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java @@ -1,34 +1,10 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nov.KgLowDurable.constant.RoleConstant; import com.nov.KgLowDurable.exception.ServiceException; import com.nov.KgLowDurable.mapper.RoleMapper; import com.nov.KgLowDurable.pojo.entity.Role; @@ -78,15 +54,15 @@ public class RoleServiceImpl extends ServiceImpl implements IR private boolean grantRoleMenu(List roleIds, List menuIds) { // 防止越权配置超管角色 - Integer administratorCount = baseMapper.selectCount(Wrappers.query().lambda().in(Role::getId, roleIds)); - if (administratorCount > 0L) { - throw new ServiceException("无权配置超管角色!"); - } +// Integer administratorCount = baseMapper.selectCount(Wrappers.query().lambda().eq(Role::getCode, RoleConstant.ADMINISTRATOR).in(Role::getId, roleIds)); +// if (administratorCount > 0L) { +// throw new ServiceException("无权配置超管角色!"); +// } // 防止越权配置管理员角色 - Integer adminCount = baseMapper.selectCount(Wrappers.query().lambda().in(Role::getId, roleIds)); - if ( adminCount > 0L) { - throw new ServiceException("无权配置管理员角色!"); - } +// Integer adminCount = baseMapper.selectCount(Wrappers.query().lambda().eq(Role::getCode, RoleConstant.ADMIN).in(Role::getId, roleIds)); +// if ( adminCount > 0L) { +// throw new ServiceException("无权配置管理员角色!"); +// } // 删除角色配置的菜单集合 roleMenuService.remove(Wrappers.update().lambda().in(RoleMenu::getRoleId, roleIds)); // 组装配置 diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuServiceImpl.java index 9a7bfe3..c47f55c 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuServiceImpl.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuSettingServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuSettingServiceImpl.java index 1189855..167a08c 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuSettingServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/TopMenuSettingServiceImpl.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/nov/KgLowDurable/wrapper/LdDictWrapper.java b/src/main/java/com/nov/KgLowDurable/wrapper/LdDictWrapper.java index 5fe103c..b6f3cb4 100644 --- a/src/main/java/com/nov/KgLowDurable/wrapper/LdDictWrapper.java +++ b/src/main/java/com/nov/KgLowDurable/wrapper/LdDictWrapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.wrapper; diff --git a/src/main/java/com/nov/KgLowDurable/wrapper/MenuWrapper.java b/src/main/java/com/nov/KgLowDurable/wrapper/MenuWrapper.java index 60bc69a..4f70302 100644 --- a/src/main/java/com/nov/KgLowDurable/wrapper/MenuWrapper.java +++ b/src/main/java/com/nov/KgLowDurable/wrapper/MenuWrapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.wrapper; import com.nov.KgLowDurable.enums.DictEnum; diff --git a/src/main/java/com/nov/KgLowDurable/wrapper/RoleWrapper.java b/src/main/java/com/nov/KgLowDurable/wrapper/RoleWrapper.java index 3c5ba3c..1f4a6e3 100644 --- a/src/main/java/com/nov/KgLowDurable/wrapper/RoleWrapper.java +++ b/src/main/java/com/nov/KgLowDurable/wrapper/RoleWrapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package com.nov.KgLowDurable.wrapper; From c380fa02e0f5717e0bd5281419b45758b614182b Mon Sep 17 00:00:00 2001 From: sugy <455459989@qq.com> Date: Mon, 5 Jan 2026 16:09:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LdDictController.java | 1 - .../controller/MenuController.java | 35 ------------------- .../service/Impl/RoleServiceImpl.java | 2 +- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdDictController.java b/src/main/java/com/nov/KgLowDurable/controller/LdDictController.java index d6559e8..38fd0b1 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdDictController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdDictController.java @@ -1,6 +1,5 @@ package com.nov.KgLowDurable.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/nov/KgLowDurable/controller/MenuController.java b/src/main/java/com/nov/KgLowDurable/controller/MenuController.java index 687dfa4..6375832 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/MenuController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/MenuController.java @@ -137,17 +137,6 @@ public class MenuController { List list = menuService.routes((roleId == null) ? null : roleId, topMenuId); return Result.OK(list); } - - /** - * 前端菜单数据 - */ -// @GetMapping("/routes-ext") -// @ApiOperation(value = "前端菜单数据", notes = "前端菜单数据") -// public Result> routesExt(String roleId, Long topMenuId) { -// List list = menuService.routesExt(roleId, topMenuId); -// return Result.OK(list); -// } - /** * 前端按钮数据 */ @@ -212,30 +201,6 @@ public class MenuController { return Result.OK(vo); } - /** - * 获取顶部菜单树形结构 - */ -// @GetMapping("/top-tree-keys") -// @ApiOperation(value = "顶部菜单所分配的树", notes = "顶部菜单所分配的树") -// public Result topTreeKeys(String topMenuIds) { -// CheckedTreeVO vo = new CheckedTreeVO(); -// vo.setMenu(menuService.topTreeKeys(topMenuIds)); -// return Result.OK(vo); -// } - - /** - * 顶部菜单数据 - */ -// @GetMapping("/top-menu") -// @ApiOperation(value = "顶部菜单数据", notes = "顶部菜单数据") -// public Result> topMenu(User user) { -// if (Func.isEmpty(user)) { -// return null; -// } -// List list = topMenuService.list(Wrappers.query().lambda().orderByAsc(TopMenu::getSort)); -// return Result.OK(list); -// } - /** * 获取配置的角色权限 */ diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java index 1cf6c24..685c864 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/RoleServiceImpl.java @@ -76,7 +76,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR // 新增配置 roleMenuService.saveBatch(roleMenus); // 递归设置下属角色菜单集合 - recursionRoleMenu(roleIds, menuIds); + //recursionRoleMenu(roleIds, menuIds); return true; }