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

Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03

This commit is contained in:
sy 2022-12-23 16:35:33 +08:00
parent d2be8e86ea 5f4ddeabd4
commit cea78e6594
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2321,14 +2321,22 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
map.put("insuranceName", item.getLabel());
map.put("insuranceId", insuranceId);
map.put("insuranceValue", dataMap.get(domkey[0]));
perList.add(map);
if (map.get("insuranceValue") != null && !"".equals(map.get("insuranceValue"))) {
perList.add(map);
}
} else if (group.getTitle().contains("公司")) {
map.put("title", group.getTitle());
map.put("paymentScope", "公司");
map.put("insuranceName", item.getLabel());
map.put("insuranceId", insuranceId);
map.put("insuranceValue", dataMap.get(domkey[0]));
comList.add(map);
if (map.get("insuranceValue") != null && !"".equals(map.get("insuranceValue"))) {
comList.add(map);
}
}
}
}