Commit fcc64871 authored by fangxinjiang's avatar fangxinjiang

代码优化

parent ae3c1f8d
...@@ -56,23 +56,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap ...@@ -56,23 +56,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
*/ */
@Override @Override
public IPage<SysMessageSalary> getSysMessageSalaryPage(Page<SysMessageSalary> page, SysMessageSalary sysMessageSalary) { public IPage<SysMessageSalary> getSysMessageSalaryPage(Page<SysMessageSalary> page, SysMessageSalary sysMessageSalary) {
YifuUser user = SecurityUtils.getUser(); // TODO 权限处理
/* if (!SecurityUtils.isHaveAllOrg(ServiceNameConstants.SERVICE_NAME_WXHR, user)) {
R<List<TSettleDomainSelectVo>> remoteGetTSettleDomainVo =
preRemoteBasicArchivesService.getInnerSettleDomainSelectVosByExtendUser(SecurityUtils.getUser());
if (remoteGetTSettleDomainVo == null) {
throw new CheckedException("调用结算服务失败");
}
if (CommonConstants.SUCCESS != remoteGetTSettleDomainVo.getCode()) {
throw new CheckedException("调用结算服务返回失败");
}
List<TSettleDomainSelectVo> remoteSettleDomainVoData = remoteGetTSettleDomainVo.getData();
if (remoteSettleDomainVoData == null) {
throw new CheckedException("未获取到相关结算信息");
}
return baseMapper.getSysMessageSalaryPage(page, sysMessageSalary, remoteSettleDomainVoData);
} else {
}*/
return baseMapper.getSysMessageSalaryPage(page, sysMessageSalary, null); return baseMapper.getSysMessageSalaryPage(page, sysMessageSalary, null);
} }
......
...@@ -70,16 +70,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc ...@@ -70,16 +70,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
*/ */
@Override @Override
public IPage<THaveSalaryNosocial> getTHaveSalaryNosocialPage(Page<THaveSalaryNosocial> page, THaveSalaryNosocial tHaveSalaryNosocial) { public IPage<THaveSalaryNosocial> getTHaveSalaryNosocialPage(Page<THaveSalaryNosocial> page, THaveSalaryNosocial tHaveSalaryNosocial) {
YifuUser user = SecurityUtils.getUser(); // TODO 数据权限待处理
/* TODO if (!SecurityUtils.isHaveAllOrg(ServiceNameConstants.SERVICE_NAME_WXHR, user)) {
R<List<TSettleDomainSelectVo>> remoteGetTSettleDomainVo =
preRemoteBasicArchivesService.getInnerSettleDomainSelectVosByExtendUser(SecurityUtils.getUser());
if (remoteGetTSettleDomainVo == null || remoteGetTSettleDomainVo.getData() == null) {
throw new CheckedException("未获取到相关结算信息");
}
return baseMapper.getTHaveSalaryNosocialPage(page, tHaveSalaryNosocial, remoteGetTSettleDomainVo.getData());
} else {
}*/
return baseMapper.getTHaveSalaryNosocialPage(page, tHaveSalaryNosocial, null); return baseMapper.getTHaveSalaryNosocialPage(page, tHaveSalaryNosocial, null);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment