|
@@ -134,7 +134,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
return null;
|
|
|
}
|
|
|
//2024-04-30以后,剔除预估工时审批的模块
|
|
|
- modules = modules.stream().filter(m->!m.getName().equals("预估工时审核")).collect(Collectors.toList());
|
|
|
+ modules = modules.stream().filter(m->!m.getName().equals("预估工时审核") && !m.getName().equals("财务审核")).collect(Collectors.toList());
|
|
|
QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().eq("package_time", 1);
|
|
|
if (company.getPackageProject() == 1) {
|
|
|
functionQueryWrapper.or().eq("package_project", 1);
|