后管角色修改，以及排序

blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java

@@ -95,7 +95,7 @@ public class RoleController extends BladeController {
     @ApiOperation(value = "列表", notes = "传入role")
     public R<List<RoleVO>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
         QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
-        List<Role> list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+        List<Role> list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()).orderByAsc(Role::getSort) : queryWrapper.orderByAsc("sort"));
         return R.data(RoleWrapper.build().listNodeVO(list));
     }
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java

@@ -340,7 +340,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
         role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
         Long aLong = baseMapper.selectCount(new QueryWrapper<Role>()
                 .eq("parent_id", role.getParentId())
-                .eq("role_name", role.getRoleName()));
+                .eq("role_name", role.getRoleName())
+                .ne("id",role.getId()));
         if (aLong > 0) {
             throw new ServiceException("角色名已存在,请重新输入");
         }