wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'

Browse Source 
feat(REQ-3488): 调整岗位常量类

See merge request universal/infrastructure/backend/orgmanax!47
This commit is contained in:
宋远伦 2024-12-26 10:12:04 +00:00
commit 9753bae509
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java
View File

@ -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;
}

24
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/constants/OrgJobConstant.java
View File

@ -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;
}

3
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/dao/OrgJobDao.java
View File

@ -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);
}