wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-11-18 11:06:03 +08:00
commit 5749a63cb0
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/app/controller/TestController.java
View File

@ -267,7 +267,7 @@ public class TestController {
R r = resultRecordService.initFlowRecord(resultRecordId);
}
// http://localhost:8080/lz_management/test/getAuth?userId=395
// http://localhost:8080/lz_management/test/getAuth?userId=314
@RequestMapping("/test/getAuth")
public R getAuth(Long userId) throws Exception{
Map<String,Integer> map = staffRoleService.getRoleByUserId(userId);

2
src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java
View File

@ -66,4 +66,6 @@ public interface StaffRoleMapper extends BaseMapper<StaffRole> {
StaffRole selectStaffRolesByStaffIdDepartmentLevelList(@Param("staffId") Long staffId, @Param("departmentLevels") List<String> departmentLevels);
List<StaffMenu> selectMenusByParentId(@Param("parentId") long parentId);
}

23
src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
View File

@ -430,6 +430,10 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
if (RoleEnums.BOSS.getName().equals(staffRole.getDepartmentLevel())) {
insertPM(staffRole, RoleMenuEnums.BOSS.getType(), staffEntity);
} else if (RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
StaffRole masterPM = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevelList(roleModel.getStaffId(), Arrays.asList(new String[]{RoleEnums.MASTER_PM.getName()}));
if(masterPM !=null){
return R.error("主管理员只能设置一个,请更改主管理员。");
}
insertPM(staffRole, RoleMenuEnums.MASTER_PM.getType(), staffEntity);
} else if (RoleEnums.CHILD_PM.getName().equals(staffRole.getDepartmentLevel())) { //如果是子管理员
if(new Long(0).equals(roleModel.getEvaluationGroupId())){//全部考评组
@ -485,17 +489,28 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
if(CollectionUtils.isNotEmpty(commonStaffList)){
staffMenus.addAll(commonStaffList);
}
if(new Integer(1).equals(departmentsStaffRelateEntity.getIsLeader())){
List<StaffMenu> staffMenuDepartmentList= staffMenuService.selectByParentId( RoleMenuEnums.DEPARTMENT_PM.getType());
if(CollectionUtils.isNotEmpty(staffMenuDepartmentList)){
staffMenus.addAll(staffMenuDepartmentList);
}
}
if(CollectionUtils.isNotEmpty(staffRoleList)){
List<StaffMenu> staffMenuList = staffRoleMapper.selectAllMenus(userId);
if(CollectionUtils.isNotEmpty(staffMenuList)){
staffMenus.addAll(staffMenuList);
}
for(StaffRole staffRole: staffRoleList){
if(staffRole.getDepartmentLevel().equals(RoleEnums.MASTER_PM.getName())){ //如果是主管理员
List<StaffMenu> staffMenuList= staffMenuService.selectByParentId( RoleMenuEnums.MASTER_PM.getType());
if(CollectionUtils.isNotEmpty(staffMenuList)){
staffMenus.addAll(staffMenuList);
}
}else{
List<StaffMenu> staffMenuList = staffRoleMapper.selectAllMenus(staffRole.getStaffId());
if(CollectionUtils.isNotEmpty(staffMenuList)){
staffMenus.addAll(staffMenuList);
}
}
}
}
if(CollectionUtils.isNotEmpty(staffMenus) && staffMenus.size() > 0 ){
List<Long> authIds = new ArrayList<>();

7
src/main/resources/mapper/flow/StaffRoleMapper.xml
View File

@ -169,6 +169,7 @@
select menu_id from lz_staff_role_menu where role_id in (
select id from lz_staff_role where staff_id = #{userId} and is_delete=0) and is_delete = 0 ) and is_delete = 0
</select>
<select id="selectAllStaffRoleByDepartmentLevel" resultType="com.lz.modules.flow.entity.StaffRole">
select * from lz_staff_role where is_delete = 0 and department_level in
<foreach collection="departmentLevels" item="item" index="index" separator="," open="(" close=")">
@ -188,7 +189,11 @@
</select>
<select id="selectAllGroupManageRoles" resultType="StaffRole" >
select * from lz_staff_role where evaluation_group_id=0 and is_delete=0 and is_delete=0
select * from lz_staff_role where evaluation_group_id=0 and is_delete=0
</select>
<select id="selectMenusByParentId" resultType="com.lz.modules.flow.entity.StaffMenu">
select * from lz_staff_menu where is_delete=0 and parent_id=#{parentId}
</select>