Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh

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<String> {
+public enum OrgJobTypeEnum {
 
     SYSTEM("系统预设"), CUSTOM("自定义");
 
     private final String desc;
 
-    @Override
     public String getCode() {
         return name();
     }

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<String> jobCodes;
-//
-//    /**
-//     * jobId 列表
-//     */
-//    private Set<Long> jobIds;
 }