qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.11.1.2402.01' into release/个税版本

This commit is contained in:
钱涛 2024-02-23 14:45:39 +08:00
parent 079b7de258 721f6046da
commit 229186e510
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
View File

@ -19,9 +19,9 @@ public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum<String> {
ONBOARD("ONBOARD", "入职", 85901), ONBOARD("ONBOARD", "入职", 85901),
PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984), PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984),
SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985), SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985),
PROMOTION("SALARY_ADJUSTMENT", "晋升", 85985), PROMOTION("PROMOTION", "晋升", 85985),
DEMOTION("SALARY_ADJUSTMENT", "降职", 85985), DEMOTION("DEMOTION", "降职", 85985),
JOB_TRANSFER("SALARY_ADJUSTMENT", "调岗", 85985), JOB_TRANSFER("JOB_TRANSFER", "调岗", 85985),
POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986), POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986),
DIMISSION("DIMISSION", "离职", 85902), DIMISSION("DIMISSION", "离职", 85902),
OTHER("OTHER", "其他", 84500), OTHER("OTHER", "其他", 84500),

6
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -241,8 +241,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (CollectionUtils.isEmpty(taxAgents)) { if (CollectionUtils.isEmpty(taxAgents)) {
//防止普通用户查询 //防止普通用户查询
queryParam.setTaxAgents(Collections.singletonList(-1L)); queryParam.setTaxAgents(Collections.singletonList(-1L));
} else if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0){ } else {
taxAgents.retainAll(paymentOrganizationIds); if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0) {
taxAgents.retainAll(paymentOrganizationIds);
}
queryParam.setTaxAgents(taxAgents); queryParam.setTaxAgents(taxAgents);
} }
} }