From dd4dcc7de9d94e9f466484f8650d2d1ade43c535 Mon Sep 17 00:00:00 2001 From: songyuanlun Date: Mon, 23 Dec 2024 10:48:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E5=B2=97=E4=BD=8D=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB=E7=A7=BB=E9=99=A4=20CodeDefinition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgmanax/api/orgjob/enums/OrgJobTypeEnum.java | 4 +--- .../axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java | 12 ++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/enums/OrgJobTypeEnum.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/enums/OrgJobTypeEnum.java index c523d50..740a155 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/enums/OrgJobTypeEnum.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/enums/OrgJobTypeEnum.java @@ -1,6 +1,5 @@ package cn.axzo.orgmanax.api.orgjob.enums; -import cn.axzo.basics.common.constant.enums.CodeDefinition; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -13,13 +12,12 @@ import lombok.Getter; */ @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) -public enum OrgJobTypeEnum implements CodeDefinition { +public enum OrgJobTypeEnum { SYSTEM("系统预设"), CUSTOM("自定义"); private final String desc; - @Override public String getCode() { return name(); } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java index bab9d8d..42d4d19 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java @@ -43,6 +43,8 @@ public class PageOrgJobReq implements IPageReq { */ @Builder.Default private Boolean needSaasRole = false; + // 以上参数优先实现 + // v1 版本接口入参兼容 /** @@ -90,14 +92,4 @@ public class PageOrgJobReq implements IPageReq { * 岗位搜索关键字 */ private String keyword; - -// /** -// * 岗位配置code集合 -// */ -// private Set jobCodes; -// -// /** -// * jobId 列表 -// */ -// private Set jobIds; }