From 32cecc59e9621cd2228f8bd648ec28212247f7cd Mon Sep 17 00:00:00 2001 From: tjq Date: Fri, 15 Mar 2024 23:18:06 +0800 Subject: [PATCH] fix: Some attributes of namespace cannot be shown back #854 --- .../powerjob/server/web/converter/NamespaceConverter.java | 2 ++ .../powerjob/server/web/response/NamespaceBaseVO.java | 8 ++++++++ .../tech/powerjob/server/web/response/NamespaceVO.java | 8 -------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/converter/NamespaceConverter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/converter/NamespaceConverter.java index b727d9e9..e5840c87 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/converter/NamespaceConverter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/converter/NamespaceConverter.java @@ -16,7 +16,9 @@ public class NamespaceConverter { public static NamespaceBaseVO do2BaseVo(NamespaceDO d) { NamespaceBaseVO v = new NamespaceBaseVO(); + BeanUtils.copyProperties(d, v); + v.setGmtCreateStr(CommonUtils.formatTime(d.getGmtCreate())); v.setGmtModifiedStr(CommonUtils.formatTime(d.getGmtModified())); v.setStatusStr(SwitchableStatus.of(d.getStatus()).name()); diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java index dbfa6ce5..b7f872c5 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java @@ -28,6 +28,14 @@ public class NamespaceBaseVO implements Serializable { */ protected String name; + private String dept; + private String tags; + + /** + * 扩展字段 + */ + private String extra; + private Integer status; private String statusStr; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java index f9bc1b83..fcd7287b 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java @@ -16,14 +16,6 @@ import tech.powerjob.server.web.request.ComponentUserRoleInfo; @ToString public class NamespaceVO extends NamespaceBaseVO { - private String dept; - private String tags; - - /** - * 扩展字段 - */ - private String extra; - /** * 访问 token * 仅拥有当前 namespace 权限的访问者可见