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

修复管理组时看不到数据问题

Browse Source
This commit is contained in:
wulin 2020-11-10 17:25:18 +08:00
parent 027596e05c
commit 067839c07d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
View File

@ -138,11 +138,13 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
//考评组管理 //考评组管理
List<StaffRole> staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId()); List<StaffRole> staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId());
if(staffRoles.size() == 0){ if(staffRoles.size() == 0){
log.info("非绩效管理员登录查询");
return null; return null;
} }
List<StaffRoleEvaluationGroup> staffRoleEvaluationGroups = List<StaffRoleEvaluationGroup> staffRoleEvaluationGroups =
staffRoleEvaluationGroupService.selectStaffRoleEvaluationsGroupByStaffRoles(staffRoles); staffRoleEvaluationGroupService.selectStaffRoleEvaluationsGroupByStaffRoles(staffRoles);
if(staffRoleEvaluationGroups.size() == 0){ if(staffRoleEvaluationGroups.size() == 0){
log.info("查询的管理组为空");
return null; return null;
} }
gIds = new ArrayList<>(); gIds = new ArrayList<>();
@ -150,6 +152,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
) { ) {
if(staffRoleEvaluationGroup.getEvaluationGroupId().longValue() == 0l){//管理所有组 if(staffRoleEvaluationGroup.getEvaluationGroupId().longValue() == 0l){//管理所有组
gIds = null; gIds = null;
log.info("管理所有组");
break; break;
} }
gIds.add(staffRoleEvaluationGroup.getEvaluationGroupId());//管理特定组 gIds.add(staffRoleEvaluationGroup.getEvaluationGroupId());//管理特定组

2
src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
View File

@ -176,7 +176,7 @@ public class EvaluationGroupController extends AbstractController {
) {//去掉已经在管理本组的管理员 ) {//去掉已经在管理本组的管理员
if(mapIds.containsKey(staffRole.getStaffId())){ if(mapIds.containsKey(staffRole.getStaffId())){
mapIds.remove(staffRole.getStaffId()); mapIds.remove(staffRole.getStaffId());
}else{ }else{//删除管理的组信息
staffRoleEvaluationGroupService.deleteStaffRoleEvaluationGroupByRoleId(staffRole.getId()); staffRoleEvaluationGroupService.deleteStaffRoleEvaluationGroupByRoleId(staffRole.getId());
} }
} }

2
src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml
View File

@ -99,7 +99,7 @@
<select id="selectStaffRoleEvaluationsGroupByStaffRoles" resultType="StaffRoleEvaluationGroup" > <select id="selectStaffRoleEvaluationsGroupByStaffRoles" resultType="StaffRoleEvaluationGroup" >
select * from lz_staff_role_evaluation_group where is_delete = 0 and select * from lz_staff_role_evaluation_group where is_delete = 0 and
id in ( role_id in (
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
#{item.id} #{item.id}
</foreach> </foreach>