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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
钱涛 2022-05-09 17:47:37 +08:00
parent 6f3d8e85c0 db4cbea487
commit 08ff95bf77
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -804,6 +804,9 @@ public class SIArchivesBiz {
map.put("departmentId", item.getDepartmentId());
map.put("jobNum", item.getJobNum());
map.put("mobile", item.getTelephone());
map.put("siSchemeId", item.getSiSchemeId());
map.put("fundSchemeId", item.getFundSchemeId());
map.put("otherSchemeId",item.getOtherSchemeId());
map.put("status", item.getUserStatusEnum() == null ? "" : item.getUserStatusEnum().getDescription());
if (socialItem != null) {
map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId()));

2
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -127,7 +127,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
@Override
public List<InsuranceArchivesEmployeePO> listPageEmployeePOS(InsuranceArchivesListParam param) {
return MapperProxyFactory.getProxy(SocialSchemeMapper.class).listPageEmployeePOS(param);
return MapperProxyFactory.getProxy(SocialSchemeMapper.class).queryEmployeeList(param);
}