|
@@ -133,6 +133,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
System.err.println("请先初始化sys_module和sys_function表");
|
|
System.err.println("请先初始化sys_module和sys_function表");
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
+ //2024-04-30以后,剔除预估工时审批的模块
|
|
|
|
+ modules = modules.stream().filter(m->!m.getName().equals("预估工时审核")).collect(Collectors.toList());
|
|
QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().eq("package_time", 1);
|
|
QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().eq("package_time", 1);
|
|
if (company.getPackageProject() == 1) {
|
|
if (company.getPackageProject() == 1) {
|
|
functionQueryWrapper.or().eq("package_project", 1);
|
|
functionQueryWrapper.or().eq("package_project", 1);
|
|
@@ -190,7 +192,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
List<SysFunction> filteredFunctions = functions.stream().filter(
|
|
List<SysFunction> filteredFunctions = functions.stream().filter(
|
|
m->Arrays.stream(functionMaps.get(str)).anyMatch(curModule->curModule.equals(m.getName()))
|
|
m->Arrays.stream(functionMaps.get(str)).anyMatch(curModule->curModule.equals(m.getName()))
|
|
).collect(Collectors.toList());
|
|
).collect(Collectors.toList());
|
|
-
|
|
|
|
generateRole(str, company, filteredModules, filteredFunctions);
|
|
generateRole(str, company, filteredModules, filteredFunctions);
|
|
}
|
|
}
|
|
}
|
|
}
|