Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
This commit is contained in:
commit
770f0f25b5
@ -371,12 +371,7 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
|||||||
List<EvaluationGroupInfo> evaluationGroupInfos = staffRoleEvaluationGroupService.selectStaffRoleEvaluationGroupBy(roleModel.getId());
|
List<EvaluationGroupInfo> evaluationGroupInfos = staffRoleEvaluationGroupService.selectStaffRoleEvaluationGroupBy(roleModel.getId());
|
||||||
info.setEvaluationGroupInfos(evaluationGroupInfos);
|
info.setEvaluationGroupInfos(evaluationGroupInfos);
|
||||||
List<StaffMenu> all = staffMenuService.selectAll();
|
List<StaffMenu> all = staffMenuService.selectAll();
|
||||||
List<StaffMenu> roots = staffMenuService.selectByParentId(0l);
|
info.setStaffMenuInfos(all);
|
||||||
for (StaffMenu root : roots) {
|
|
||||||
getStaffMenuInfo(root, all);
|
|
||||||
}
|
|
||||||
info.setStaffMenuInfos(roots);
|
|
||||||
|
|
||||||
List<StaffMenu> staffMenus = staffRoleMenuService.selectByRoleId(staffRole.getId());
|
List<StaffMenu> staffMenus = staffRoleMenuService.selectByRoleId(staffRole.getId());
|
||||||
List<Long> selectStaffMenuInfos = new ArrayList<>();
|
List<Long> selectStaffMenuInfos = new ArrayList<>();
|
||||||
for (StaffMenu staffMenu : staffMenus) {
|
for (StaffMenu staffMenu : staffMenus) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user