抢晒镜修改
This commit is contained in:
parent
6a9c04d103
commit
33897beb46
@ -431,12 +431,12 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
|||||||
} else if (RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
|
} else if (RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
|
||||||
insertPM(staffRole, RoleMenuEnums.MASTER_PM.getType(), staffEntity);
|
insertPM(staffRole, RoleMenuEnums.MASTER_PM.getType(), staffEntity);
|
||||||
} else if (RoleEnums.CHILD_PM.getName().equals(staffRole.getDepartmentLevel())) { //如果是子管理员
|
} else if (RoleEnums.CHILD_PM.getName().equals(staffRole.getDepartmentLevel())) { //如果是子管理员
|
||||||
for (Long evaluationGroupId : evaluationGroupInfoIds) {
|
if(new Long(0).equals(roleModel.getEvaluationGroupId())){//全部考评组
|
||||||
StaffRoleEvaluationGroup evaluationGroup = new StaffRoleEvaluationGroup();
|
insertStaffRoleEvaluationGroup(staffRole.getId(),0l);
|
||||||
evaluationGroup.setIsSelect(1);
|
}else{///部分考评组
|
||||||
evaluationGroup.setRoleId(staffRole.getId());
|
for (Long evaluationGroupId : evaluationGroupInfoIds) {
|
||||||
evaluationGroup.setEvaluationGroupId(evaluationGroupId);
|
insertStaffRoleEvaluationGroup(staffRole.getId(),evaluationGroupId);
|
||||||
staffRoleEvaluationGroupService.insertStaffRoleEvaluationGroup(evaluationGroup);
|
}
|
||||||
}
|
}
|
||||||
if (roleModel.getDepartmentId().equals(DepartmentPMEnums.SELF_DEPARTMENT.getType().toString())) {//如果是自己所在部门
|
if (roleModel.getDepartmentId().equals(DepartmentPMEnums.SELF_DEPARTMENT.getType().toString())) {//如果是自己所在部门
|
||||||
departmentInfoIds.clear();
|
departmentInfoIds.clear();
|
||||||
@ -451,6 +451,7 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
|||||||
staffRoleDepartment.setDepartmentName(departmentsEntity.getDepartmentName());
|
staffRoleDepartment.setDepartmentName(departmentsEntity.getDepartmentName());
|
||||||
staffRoleDepartmentService.insertStaffRoleDepartment(staffRoleDepartment);
|
staffRoleDepartmentService.insertStaffRoleDepartment(staffRoleDepartment);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Long staffMenuId : selectStaffMenuInfoIdIds) {
|
for (Long staffMenuId : selectStaffMenuInfoIdIds) {
|
||||||
StaffRoleMenu staffRoleMenu = new StaffRoleMenu();
|
StaffRoleMenu staffRoleMenu = new StaffRoleMenu();
|
||||||
staffRoleMenu.setRoleId(staffRole.getId());
|
staffRoleMenu.setRoleId(staffRole.getId());
|
||||||
@ -526,13 +527,19 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
|||||||
staffRoleMenuService.insertStaffRoleMenu(staffRoleMenu);
|
staffRoleMenuService.insertStaffRoleMenu(staffRoleMenu);
|
||||||
}
|
}
|
||||||
if (parentId.equals(RoleMenuEnums.MASTER_PM.getType())) { //如果是绩效管理员
|
if (parentId.equals(RoleMenuEnums.MASTER_PM.getType())) { //如果是绩效管理员
|
||||||
StaffRoleEvaluationGroup staffRoleEvaluationGroup = new StaffRoleEvaluationGroup();
|
insertStaffRoleEvaluationGroup(staffRole.getId(),0l);
|
||||||
staffRoleEvaluationGroup.setRoleId(staffRole.getId());
|
|
||||||
staffRoleEvaluationGroup.setIsSelect(1);
|
|
||||||
staffRoleEvaluationGroupService.insertStaffRoleEvaluationGroup(staffRoleEvaluationGroup);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void insertStaffRoleEvaluationGroup(Long roleId,Long evaluationGroupId){
|
||||||
|
StaffRoleEvaluationGroup staffRoleEvaluationGroup = new StaffRoleEvaluationGroup();
|
||||||
|
staffRoleEvaluationGroup.setRoleId(roleId);
|
||||||
|
staffRoleEvaluationGroup.setEvaluationGroupId(evaluationGroupId);
|
||||||
|
staffRoleEvaluationGroup.setIsSelect(1);
|
||||||
|
staffRoleEvaluationGroupService.insertStaffRoleEvaluationGroup(staffRoleEvaluationGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void getStaffMenuInfo(StaffMenu parent, List<StaffMenu> all) {
|
public void getStaffMenuInfo(StaffMenu parent, List<StaffMenu> all) {
|
||||||
List<StaffMenu> childs = new ArrayList<>();
|
List<StaffMenu> childs = new ArrayList<>();
|
||||||
for (StaffMenu child : all) {
|
for (StaffMenu child : all) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user