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;