|
@@ -2870,7 +2870,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
ReportForm reportForm = reportFormMapper.selectOne(new QueryWrapper<ReportForm>().eq("report_form_name", tableName));
|
|
ReportForm reportForm = reportFormMapper.selectOne(new QueryWrapper<ReportForm>().eq("report_form_name", tableName));
|
|
List<SysFunction> sysFunctionList = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().eq("report_form_id", reportForm.getId()));
|
|
List<SysFunction> sysFunctionList = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().eq("report_form_id", reportForm.getId()));
|
|
String allName = sysFunctionList.stream().filter(sl -> sl.getName().contains("全公司")||sl.getName().contains("全部")||sl.getName().contains("工时成本预警表")||sl.getName().contains("日报待审核")||sl.getName().contains("客户项目利润表")).findFirst().get().getName();
|
|
String allName = sysFunctionList.stream().filter(sl -> sl.getName().contains("全公司")||sl.getName().contains("全部")||sl.getName().contains("工时成本预警表")||sl.getName().contains("日报待审核")||sl.getName().contains("客户项目利润表")).findFirst().get().getName();
|
|
- String deptName = sysFunctionList.stream().filter(sl -> sl.getName().contains("负责部门")||sl.getName().contains("负责")||sl.getName().contains("工时成本预警表")||sl.getName().contains("日报待审核")||sl.getName().contains("客户项目利润表")).findFirst().get().getName();
|
|
|
|
|
|
+ Optional<SysFunction> deptsysOptional = sysFunctionList.stream().filter(sl -> sl.getName().contains("负责部门") || sl.getName().contains("负责") || sl.getName().contains("工时成本预警表") || sl.getName().contains("日报待审核") || sl.getName().contains("客户项目利润表")).findFirst();
|
|
|
|
+ String deptName="";
|
|
|
|
+ if (deptsysOptional.isPresent()){
|
|
|
|
+ SysFunction deptSysFunction = deptsysOptional.get();
|
|
|
|
+ deptName = deptSysFunction.getName();
|
|
|
|
+ }
|
|
List<SysRichFunction> functionAllList = sysFunctionMapper.getRoleFunctions(user.getRoleId(),allName);
|
|
List<SysRichFunction> functionAllList = sysFunctionMapper.getRoleFunctions(user.getRoleId(),allName);
|
|
List<SysRichFunction> functionDeptList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), deptName);
|
|
List<SysRichFunction> functionDeptList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), deptName);
|
|
List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
|
|
List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
|