diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java index e6ae8bac..0dc32080 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java @@ -40,4 +40,12 @@ public interface SystemRoleDAO extends IMapper { */ Long getRoleIdByUserIdAndRoleCode(@Param("userId") Long userId, @Param("code") String code); + /** + * 查询用户角色 + * + * @param userId userId + * @return roles + */ + List selectRoleByUserId(@Param("userId") Long userId); + } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemUserVO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemUserVO.java index 52c9cdc7..3a6da56d 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemUserVO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemUserVO.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 用户 视图响应对象 @@ -61,4 +62,7 @@ public class SystemUserVO implements Serializable { @Schema(description = "修改人") private String updater; + @Schema(description = "用户角色") + private List roles; + } diff --git a/orion-ops-ui/src/api/user/user.ts b/orion-ops-ui/src/api/user/user.ts index 63c30738..16439a3c 100644 --- a/orion-ops-ui/src/api/user/user.ts +++ b/orion-ops-ui/src/api/user/user.ts @@ -1,5 +1,6 @@ import type { DataGrid, Pagination } from '@/types/global'; import type { TableData } from '@arco-design/web-vue/es/table/interface'; +import type { RoleQueryResponse } from '@/api/user/role'; import axios from 'axios'; /** @@ -55,6 +56,7 @@ export interface UserQueryResponse extends TableData { updateTime: number; creator: string; updater: string; + roles: Array; } /** diff --git a/orion-ops-ui/src/components/app/app-footer/index.vue b/orion-ops-ui/src/components/app/app-footer/index.vue index d095a7c1..1c4d6803 100644 --- a/orion-ops-ui/src/components/app/app-footer/index.vue +++ b/orion-ops-ui/src/components/app/app-footer/index.vue @@ -6,7 +6,7 @@ github gitee - 文档 + 文档 License v{{ version }} 开源版 diff --git a/orion-ops-ui/src/components/system/menu/tree/index1.vue b/orion-ops-ui/src/components/system/menu/tree/index1.vue deleted file mode 100644 index 47be2d7a..00000000 --- a/orion-ops-ui/src/components/system/menu/tree/index1.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue b/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue index e3ae9db6..a169d03d 100644 --- a/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue +++ b/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue @@ -1,8 +1,8 @@