From a590c542603c709c12df4f278ac6758492350778 Mon Sep 17 00:00:00 2001
From: songyuanlun <songyuanlun@axzo.cn>
Date: Thu, 26 Dec 2024 18:08:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3488):=20=E8=B0=83=E6=95=B4=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D=E5=B8=B8=E9=87=8F=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orgmanax/dto/job/dto/OrgJobConstants.java | 10 ++++++++
 .../infra/constants/OrgJobConstant.java       | 24 -------------------
 .../infra/dao/orgjob/dao/OrgJobDao.java       |  3 +--
 3 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/constants/OrgJobConstant.java

diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java
index 7f5a16b..7010ba5 100644
--- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java
+++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java
@@ -37,4 +37,14 @@ public interface OrgJobConstants {
     String CODE_KEY = "code";
     String OLD_NEW_JOB_CODE_MAP_KEY = "job_code_mapping";
     Integer JOB_PAGE_SIZE = 1000;
+
+    /**
+     * 系统操作人的personId
+     */
+    Long SYSTEM_OPERATOR_ID = -1L;
+
+    /**
+     * 默认岗位的标识
+     */
+    Integer ORG_JOB_DEF_FLAG = 1;
 }
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/constants/OrgJobConstant.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/constants/OrgJobConstant.java
deleted file mode 100644
index 47b9858..0000000
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/constants/OrgJobConstant.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.axzo.orgmanax.infra.constants;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-/**
- * @description 岗位相关的常量
- * @author luofu
- * @version 1.0
- * @date 2024/9/12
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class OrgJobConstant {
-
-    /**
-     * 系统操作人的personId
-     */
-    public static final long SYSTEM_OPERATOR_ID = -1L;
-
-    /**
-     * 默认岗位的标识
-     */
-    public static final int ORG_JOB_DEF_FLAG = 1;
-}
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/dao/OrgJobDao.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/dao/OrgJobDao.java
index a948c5b..7c57edf 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/dao/OrgJobDao.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/dao/OrgJobDao.java
@@ -1,6 +1,5 @@
 package cn.axzo.orgmanax.infra.dao.orgjob.dao;
 
-import cn.axzo.orgmanax.infra.constants.OrgJobConstant;
 import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob;
 import cn.axzo.orgmanax.infra.dao.orgjob.mapper.OrgJobMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,7 +35,7 @@ public class OrgJobDao extends ServiceImpl<OrgJobMapper, OrgJob> {
         if (Objects.isNull(id)) {
             return 0;
         }
-        operatorId = Optional.ofNullable(operatorId).orElse(OrgJobConstant.SYSTEM_OPERATOR_ID);
+        operatorId = Optional.ofNullable(operatorId).orElse(-1L);
         return getBaseMapper().remove(id, operatorId);
     }