diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java index fb3f761cc..626635040 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java @@ -19,9 +19,9 @@ public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum { ONBOARD("ONBOARD", "入职", 85901), PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984), SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985), - PROMOTION("SALARY_ADJUSTMENT", "晋升", 85985), - DEMOTION("SALARY_ADJUSTMENT", "降职", 85985), - JOB_TRANSFER("SALARY_ADJUSTMENT", "调岗", 85985), + PROMOTION("PROMOTION", "晋升", 85985), + DEMOTION("DEMOTION", "降职", 85985), + JOB_TRANSFER("JOB_TRANSFER", "调岗", 85985), POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986), DIMISSION("DIMISSION", "离职", 85902), OTHER("OTHER", "其他", 84500), diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 857196426..f4a03e1c9 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -241,8 +241,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (CollectionUtils.isEmpty(taxAgents)) { //防止普通用户查询 queryParam.setTaxAgents(Collections.singletonList(-1L)); - } else if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0){ - taxAgents.retainAll(paymentOrganizationIds); + } else { + if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0) { + taxAgents.retainAll(paymentOrganizationIds); + } queryParam.setTaxAgents(taxAgents); } }