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

fix

Browse Source
This commit is contained in:
杜建超 2020-11-13 17:40:04 +08:00
parent 564a791d5f
commit b934f54d98
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
View File

@ -184,7 +184,7 @@ public class ChartResultServiceImpl implements ChartResultService {
public PageUtils selectChartDetailList(ChartResultReq req) { public PageUtils selectChartDetailList(ChartResultReq req) {
List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId());
//自己管理的和所有的部门交集 //自己管理的和所有的部门交集
log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds)); log.info("selectChartDetailList 查询部门：" + JSON.toJSONString(allDeparmentIds));
List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
if(mandepartmentIds!=null ){ if(mandepartmentIds!=null ){
if(mandepartmentIds.size()==0){ if(mandepartmentIds.size()==0){
@ -196,6 +196,9 @@ public class ChartResultServiceImpl implements ChartResultService {
return new PageUtils(); return new PageUtils();
} }
} }
else {
mandepartmentIds.retainAll(allDeparmentIds);
}
log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds)); log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds));
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
page -> resultRecordMapper.selectChartDetailList(page,mandepartmentIds,req.getStartId(),req.getScoreLevel()) page -> resultRecordMapper.selectChartDetailList(page,mandepartmentIds,req.getStartId(),req.getScoreLevel())