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

Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01

This commit is contained in:
sy 2023-01-12 18:32:11 +08:00
parent 3abffc2ee9 3ed6c43a93
commit 57753bfb4a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -1476,7 +1476,10 @@ public class SIAccountBiz extends Service {
if (archivesPerson != null) {
categoryIds.forEach(item -> {
if (archivesPerson.containsKey(String.valueOf(item)) && schemeperson.containsKey(item)) {
needArchivesPerson.add(item);
if (StringUtils.isNotBlank(archivesPerson.get(item))) {
needArchivesPerson.add(item);
}
}
});
}
@ -1512,7 +1515,10 @@ public class SIAccountBiz extends Service {
if (archivesCom != null) {
categoryIds.forEach(item -> {
if (archivesCom.containsKey(String.valueOf(item)) && schemeCom.containsKey(item)) {
needArchivesCom.add(item);
if (StringUtils.isNotBlank(archivesCom.get(item))) {
needArchivesCom.add(item);
}
}
});