Commit 17e5badc authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

parents 000b9585 b712f3b6
......@@ -35,6 +35,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
*/
@Override
public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){
/* 2023-09-13 段亚玲 按用户组授权,取消内置项目权限
YifuUser user = SecurityUtils.getUser();
TSettleDomainListVo vo = null;
if (Common.isNotNull(user) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
......@@ -49,7 +50,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
}
if (Common.isNotNull(vo)){
return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds()));
}
}*/
return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, 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