diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index b3a8c21e..4b4ba480 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -474,6 +474,10 @@ public class StaffRoleServiceImpl extends ServiceImpl staffRoleList = staffRoleMapper.selectAllByStaffId(userId); List staffMenus = new ArrayList<>(); DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(userId); + List commonStaffList= staffMenuService.selectByParentId( RoleMenuEnums.COMMON_STAFF.getType()); + if(CollectionUtils.isNotEmpty(commonStaffList)){ + staffMenus.addAll(commonStaffList); + } if(new Integer(1).equals(departmentsStaffRelateEntity.getIsLeader())){ List staffMenuDepartmentList= staffMenuService.selectByParentId( RoleMenuEnums.DEPARTMENT_PM.getType()); if(CollectionUtils.isNotEmpty(staffMenuDepartmentList)){