Merge branch 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management
This commit is contained in:
commit
924cc3de41
@ -377,7 +377,9 @@ public class ChartResultServiceImpl implements ChartResultService {
|
|||||||
return Collections.EMPTY_LIST;
|
return Collections.EMPTY_LIST;
|
||||||
}
|
}
|
||||||
log.info("selectChartDetailList 管理部门:" + JSON.toJSONString(mandepartmentIds));
|
log.info("selectChartDetailList 管理部门:" + JSON.toJSONString(mandepartmentIds));
|
||||||
mandepartmentIds.retainAll(allDeparmentIds);
|
if(CollectionUtils.isNotEmpty(allDeparmentIds)){
|
||||||
|
mandepartmentIds.retainAll(allDeparmentIds);
|
||||||
|
}
|
||||||
if(mandepartmentIds.size()==0){
|
if(mandepartmentIds.size()==0){
|
||||||
return Collections.EMPTY_LIST;
|
return Collections.EMPTY_LIST;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user