Skip to content

Y
yifu-mvp
Commit 17e5badc authored by huyuchen's avatar huyuchen
Browse files
Options

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

parents 000b9585 b712f3b6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TConfigSalaryServiceImpl.java
View file @ 17e5badc
...@@ -35,6 +35,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T ...@@ -35,6 +35,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
*/ */
@Override @Override
public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){ public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){
/* 2023-09-13 段亚玲 按用户组授权，取消内置项目权限
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
TSettleDomainListVo vo = null; TSettleDomainListVo vo = null;
if (Common.isNotNull(user) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) { if (Common.isNotNull(user) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
...@@ -49,7 +50,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T ...@@ -49,7 +50,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
} }
if (Common.isNotNull(vo)){ if (Common.isNotNull(vo)){
return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds())); return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds()));
} }*/
return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, null)); 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